aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkris <kris@FreeBSD.org>2001-04-30 18:13:07 +0800
committerkris <kris@FreeBSD.org>2001-04-30 18:13:07 +0800
commitc6378480b37ab9bf8f14c2059a5ba4ce03f64b0d (patch)
treecb7e8197f646e7e26dd15610e714d29ce7e31741
parentb54b7e30a8531e8c09f91984667ef3ac2325bd94 (diff)
downloadfreebsd-ports-graphics-c6378480b37ab9bf8f14c2059a5ba4ce03f64b0d.tar.gz
freebsd-ports-graphics-c6378480b37ab9bf8f14c2059a5ba4ce03f64b0d.tar.zst
freebsd-ports-graphics-c6378480b37ab9bf8f14c2059a5ba4ce03f64b0d.zip
Don't hardcode CC and CFLAGS to -O3
-rw-r--r--cad/felt/files/patch-aa60
-rw-r--r--science/felt/files/patch-aa60
2 files changed, 82 insertions, 38 deletions
diff --git a/cad/felt/files/patch-aa b/cad/felt/files/patch-aa
index 73bdcbfccea..dfc136434b6 100644
--- a/cad/felt/files/patch-aa
+++ b/cad/felt/files/patch-aa
@@ -1,19 +1,41 @@
-*** configure.orig Fri May 12 00:33:57 2000
---- configure Fri May 12 00:39:34 2000
-***************
-*** 222,228 ****
- CONTRIBFLAGS = $CONTRIBFLAGS
- CPP = $CPP
- DESTBIN = $DEST/bin
-! DESTLIB = $DEST/lib/felt
- DESTMAN = $DEST/man
- INSTALL = sh \$(TOPDIR)/etc/install.sh -c
- LDOPTS =
---- 222,228 ----
- CONTRIBFLAGS = $CONTRIBFLAGS
- CPP = $CPP
- DESTBIN = $DEST/bin
-! DESTLIB = $DEST/share/felt
- DESTMAN = $DEST/man
- INSTALL = sh \$(TOPDIR)/etc/install.sh -c
- LDOPTS =
+--- configure.orig Mon May 29 23:29:15 1995
++++ configure Mon Apr 30 03:03:43 2001
+@@ -71,7 +71,6 @@
+
+ echo Configuring ...
+
+-which CC gcc
+ which RANLIB ranlib
+ which CAT cat
+ which TRUE true
+@@ -136,7 +135,6 @@
+
+ # provide worst-case defaults
+
+-: ${CC:=cc}
+ : ${RANLIB:=$TRUE}
+ : ${READDIR:=/lib}
+ : ${DEST}:=.}
+@@ -145,12 +143,11 @@
+ : ${X11INC:=.}
+ : ${X11LIB:=.}
+
+-CC=`basename $CC`
+ RANLIB=`basename $RANLIB`
+ READDIR=`dirname $READDIR`
+ CONTRIBDIR=none
+
+-if [ $CC = gcc ]; then CCOPTS=-O3; else CCOPTS=-O; fi
++CCOPTS=${CFLAGS}
+
+
+ # defaults for known architectures that fail the above
+@@ -222,7 +219,7 @@
+ CONTRIBFLAGS = $CONTRIBFLAGS
+ CPP = $CPP
+ DESTBIN = $DEST/bin
+-DESTLIB = $DEST/lib/felt
++DESTLIB = $DEST/share/felt
+ DESTMAN = $DEST/man
+ INSTALL = sh \$(TOPDIR)/etc/install.sh -c
+ LDOPTS =
diff --git a/science/felt/files/patch-aa b/science/felt/files/patch-aa
index 73bdcbfccea..dfc136434b6 100644
--- a/science/felt/files/patch-aa
+++ b/science/felt/files/patch-aa
@@ -1,19 +1,41 @@
-*** configure.orig Fri May 12 00:33:57 2000
---- configure Fri May 12 00:39:34 2000
-***************
-*** 222,228 ****
- CONTRIBFLAGS = $CONTRIBFLAGS
- CPP = $CPP
- DESTBIN = $DEST/bin
-! DESTLIB = $DEST/lib/felt
- DESTMAN = $DEST/man
- INSTALL = sh \$(TOPDIR)/etc/install.sh -c
- LDOPTS =
---- 222,228 ----
- CONTRIBFLAGS = $CONTRIBFLAGS
- CPP = $CPP
- DESTBIN = $DEST/bin
-! DESTLIB = $DEST/share/felt
- DESTMAN = $DEST/man
- INSTALL = sh \$(TOPDIR)/etc/install.sh -c
- LDOPTS =
+--- configure.orig Mon May 29 23:29:15 1995
++++ configure Mon Apr 30 03:03:43 2001
+@@ -71,7 +71,6 @@
+
+ echo Configuring ...
+
+-which CC gcc
+ which RANLIB ranlib
+ which CAT cat
+ which TRUE true
+@@ -136,7 +135,6 @@
+
+ # provide worst-case defaults
+
+-: ${CC:=cc}
+ : ${RANLIB:=$TRUE}
+ : ${READDIR:=/lib}
+ : ${DEST}:=.}
+@@ -145,12 +143,11 @@
+ : ${X11INC:=.}
+ : ${X11LIB:=.}
+
+-CC=`basename $CC`
+ RANLIB=`basename $RANLIB`
+ READDIR=`dirname $READDIR`
+ CONTRIBDIR=none
+
+-if [ $CC = gcc ]; then CCOPTS=-O3; else CCOPTS=-O; fi
++CCOPTS=${CFLAGS}
+
+
+ # defaults for known architectures that fail the above
+@@ -222,7 +219,7 @@
+ CONTRIBFLAGS = $CONTRIBFLAGS
+ CPP = $CPP
+ DESTBIN = $DEST/bin
+-DESTLIB = $DEST/lib/felt
++DESTLIB = $DEST/share/felt
+ DESTMAN = $DEST/man
+ INSTALL = sh \$(TOPDIR)/etc/install.sh -c
+ LDOPTS =