Bug 65277
| Summary: | [PATCH] devel/imake-4: [Respect CC & CXX (which will respect CC&CXX on almost every port that uses imake] | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Michael Johnson <ahze> | ||||
| Component: | Individual Port(s) | Assignee: | Michael Johnson <ahze> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Only Me | CC: | x11 | ||||
| Priority: | Normal | ||||||
| Version: | Latest | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
Responsible Changed From-To: freebsd-ports-bugs->x11 Over to maintainer(s). 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
Unfortunately, the suggested patch would only provide different set of defaults for CC, CXX and CPP that would be available at imake compile time. These are, however, only defaults. The build infrastructure, already takes into account the values of those variables. In other words these variables get put in Makefiles created by imake, but they can be overriden following usual make(1) rules. At least X11 ports (XFree86-4-libraries for example) do respect these variables on command line or in /etc/make.conf no matter what the setting in FreeBSD.cf is. Are there any particular ports that have problems with this? Responsible Changed From-To: x11->freebsd-x11 While PRs for ports maintained by x11@FreeBSD.org have for some time been assigned to 'x11', this creates duplicate reminder email postings to the mailing lists. The canonical form should now be 'freebsd-x11'. Responsible Changed From-To: freebsd-x11->ahze Submitter is now committer, so haunt him :) State Changed From-To: open->closed Don't know if this is still a problem, don't use imake-4 anymore. |
- Respect CC & CXX - Remove lib/X11/doc/html/manindex1.html from pkg-plist (does not install and is not in ${WRKSRC} anywhere.) I bumped PORTREVISION because CC and CXX are held in lib/X11/config/FreeBSD.cf right now almost every port that uses imake (unless there is a patch) does not respect CC & CXX becaues imake doesn't respect CC and CXX Port maintainer (x11@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.50