diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2003-12-15 07:45:53 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2003-12-15 07:45:53 +0000 |
| commit | c563a2cc0098ab04cb2bfeac41600bbf88ff3b6c (patch) | |
| tree | 193c5fe4ca66343157758771f72db1379ab23439 /lang/gcc45 | |
| parent | Update from 1.3.11 RC to offical 1.3.11 release. (diff) | |
* Deal with GCC's configurary's assumption that /usr/local/{include,lib}
are searched automatically by the compiler by using --with-libiconv-prefix.
W/o --with-libiconv-prefix, 'configure' finds the lib, but not the header.
During the make, neither will be found; a lot of inconsistency here...
* Deal with GCC's configurary's brokenness WRT --with-libiconv-prefix due
not actually passing the found header path to CFLAGS in any way.
Notes
Notes:
svn path=/head/; revision=95853
Diffstat (limited to 'lang/gcc45')
| -rw-r--r-- | lang/gcc45/Makefile | 4 | ||||
| -rw-r--r-- | lang/gcc45/files/patch-gcc-Makefile.in | 5 | ||||
| -rw-r--r-- | lang/gcc45/files/patch-gcc-configure | 5 |
3 files changed, 14 insertions, 0 deletions
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile index d66f453c56cb..ff87f400dfda 100644 --- a/lang/gcc45/Makefile +++ b/lang/gcc45/Makefile @@ -52,6 +52,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_BISON= yes CONFIGURE_ARGS= --disable-nls \ + --with-libiconv-prefix=${LOCALBASE} \ --with-gxx-include-dir=${TARGLIB}/include/c++/${GCC_REV} #CONFIGURE_ARGS+= --program-suffix=34 # Java @@ -78,6 +79,9 @@ MAN1= cpp34.1 g++34.1 g77-34.1 gcc34.1 gcov34.1 \ MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar +pre-everything:: + @${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT} target ${CONFIGURE_TARGET}" + .if defined(CVS_DATE) NO_CHECKSUM= yes DIST_SUBDIR= ${PKGNAME} diff --git a/lang/gcc45/files/patch-gcc-Makefile.in b/lang/gcc45/files/patch-gcc-Makefile.in new file mode 100644 index 000000000000..9e69d6003011 --- /dev/null +++ b/lang/gcc45/files/patch-gcc-Makefile.in @@ -0,0 +1,5 @@ +--- gcc/Makefile.in.orig Sun Dec 7 18:32:10 2003 ++++ gcc/Makefile.in Sun Dec 14 23:19:41 2003 +@@ -707 +707 @@ +-ALL_CPPFLAGS = $(CPPFLAGS) $(X_CPPFLAGS) $(T_CPPFLAGS) ++ALL_CPPFLAGS = $(CPPFLAGS) $(X_CPPFLAGS) $(T_CPPFLAGS) @CONFIGURE_CPPFLAGS@ diff --git a/lang/gcc45/files/patch-gcc-configure b/lang/gcc45/files/patch-gcc-configure new file mode 100644 index 000000000000..9e9b426276e0 --- /dev/null +++ b/lang/gcc45/files/patch-gcc-configure @@ -0,0 +1,5 @@ +--- gcc/configure.orig Sun Dec 14 22:51:04 2003 ++++ gcc/configure Sun Dec 14 22:51:25 2003 +@@ -8112 +8112 @@ +-s%@CPPFLAGS@%$CPPFLAGS%g ++s%@CONFIGURE_CPPFLAGS@%$CPPFLAGS%g |