Date: Wed, 7 Apr 2004 07:02:06 -0400 From: michael johnson <ahze@ahze.net> To: freebsd-ports-bugs@FreeBSD.org, FreeBSD-gnats-submit@FreeBSD.org Subject: Re: ports/65277: [PATCH] devel/imake: [Respect CC & CXX (which will respect CC&CXX on almost every port that uses imake] Message-ID: <0268B18C-8883-11D8-AD1B-000A958C81C6@ahze.net> In-Reply-To: <200404070220.i372KLGA017746@freefall.freebsd.org> References: <200404070220.i372KLGA017746@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
here's a patch for CPP also.
diff -ruN imake-4.orig/Makefile imake-4/Makefile
--- imake-4.orig/Makefile Wed Apr 7 06:57:44 2004
+++ imake-4/Makefile Wed Apr 7 06:59:26 2004
@@ -70,7 +70,8 @@
pre-configure:
@${REINPLACE_CMD} -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g ; \
s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; \
- s|%%CC%%|${CC}|g; s|%%CXX%%|${CXX}|g' \
+ s|%%CC%%|${CC}|g; s|%%CXX%%|${CXX}|g; \
+ s|%%CPP%%|${CPP}|g' \
${WRKSRC}/cf/FreeBSD.cf
post-install:
diff -ruN imake-4.orig/files/patch-d imake-4/files/patch-d
--- imake-4.orig/files/patch-d Wed Apr 7 06:57:44 2004
+++ imake-4/files/patch-d Wed Apr 7 06:58:50 2004
@@ -1,5 +1,5 @@
--- cf/FreeBSD.cf.orig Tue Jan 14 21:52:12 2003
-+++ cf/FreeBSD.cf Tue Apr 6 22:04:40 2004
++++ cf/FreeBSD.cf Wed Apr 7 06:58:31 2004
@@ -89,14 +89,14 @@
# endif
# define HasPosixThreads YES
@@ -29,7 +29,7 @@
# endif
# define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB)
# define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB)
$(XTHRSTUBLIB)
-@@ -162,11 +162,11 @@
+@@ -162,14 +162,14 @@
* ld: warning: libXThrStub.so.6, needed by libX11.so, not found
*/
#if BuildThreadStubLibrary && (!defined(UseInstalledX11) ||
!UseInstalledX11)
@@ -44,7 +44,11 @@
+# define CplusplusCmd %%CXX%%
#endif
- #define CppCmd /usr/bin/cpp
+-#define CppCmd /usr/bin/cpp
++#define CppCmd %%CPP%%
+ #define PreProcessCmd CppCmd
+ #define StandardCppOptions -traditional
+ #define StandardCppDefines /**/
@@ -485,14 +485,14 @@
/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
#ifndef DefaultGcc2i386Opt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?0268B18C-8883-11D8-AD1B-000A958C81C6>