diff options
| author | olgeni <olgeni@FreeBSD.org> | 2009-06-10 23:57:29 +0800 |
|---|---|---|
| committer | olgeni <olgeni@FreeBSD.org> | 2009-06-10 23:57:29 +0800 |
| commit | cf3933b1ba674650565188646aa667e2d62608a2 (patch) | |
| tree | 62458deeb7ccfe2d9ca60535091ada385a7c52c7 /lang | |
| parent | 81e89f3a5ffcc1929bd0693120aaffcabdb7ff9b (diff) | |
| download | freebsd-ports-gnome-cf3933b1ba674650565188646aa667e2d62608a2.tar.gz freebsd-ports-gnome-cf3933b1ba674650565188646aa667e2d62608a2.tar.zst freebsd-ports-gnome-cf3933b1ba674650565188646aa667e2d62608a2.zip | |
Remove dependency on GCC 4.3: allow proper CFLAGS to reach lib/wx/configure.
Obtained from: vanilla
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/erlang/Makefile | 3 | ||||
| -rw-r--r-- | lang/erlang/files/patch-lib_wx_configure | 11 | ||||
| -rw-r--r-- | lang/erlang14/Makefile | 3 | ||||
| -rw-r--r-- | lang/erlang14/files/patch-lib_wx_configure | 11 |
4 files changed, 26 insertions, 2 deletions
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index 58c2103522b9..4f33be393e77 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -57,7 +57,6 @@ CONFIGURE_ARGS+= --with-wx-config=${WX_CONFIG} .endif .endif -USE_GCC= 4.3 USE_GMAKE= yes USE_PERL5= yes USE_RC_SUBR= epmd.sh @@ -106,6 +105,8 @@ MAN4PREFIX= ${PREFIX}/lib/erlang MAN6PREFIX= ${PREFIX}/lib/erlang pre-configure: + @${REINPLACE_CMD} -e 's#%%CFLAGS%%#${CFLAGS}#g' ${WRKSRC}/lib/wx/configure + # Check if ${JAVAC} exists. .if !defined(WITHOUT_JAVA) @if [ ! -x ${JAVAC} ]; then \ diff --git a/lang/erlang/files/patch-lib_wx_configure b/lang/erlang/files/patch-lib_wx_configure new file mode 100644 index 000000000000..8a334f042c0b --- /dev/null +++ b/lang/erlang/files/patch-lib_wx_configure @@ -0,0 +1,11 @@ +--- lib/wx/configure.orig 2009-06-10 10:35:03.000000000 +0800 ++++ lib/wx/configure 2009-06-10 10:35:23.000000000 +0800 +@@ -3210,7 +3210,7 @@ + ;; + *) + DEBUG_CFLAGS="-g -Wall -fPIC -DDEBUG $CFLAGS" +- CFLAGS="-g -Wall -O2 -fPIC -fomit-frame-pointer -fno-strict-aliasing $CFLAGS" ++ CFLAGS="-Wall -fPIC -fomit-frame-pointer -fno-strict-aliasing $CFLAGS %%CFLAGS%%" + ;; + esac + diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile index 58c2103522b9..4f33be393e77 100644 --- a/lang/erlang14/Makefile +++ b/lang/erlang14/Makefile @@ -57,7 +57,6 @@ CONFIGURE_ARGS+= --with-wx-config=${WX_CONFIG} .endif .endif -USE_GCC= 4.3 USE_GMAKE= yes USE_PERL5= yes USE_RC_SUBR= epmd.sh @@ -106,6 +105,8 @@ MAN4PREFIX= ${PREFIX}/lib/erlang MAN6PREFIX= ${PREFIX}/lib/erlang pre-configure: + @${REINPLACE_CMD} -e 's#%%CFLAGS%%#${CFLAGS}#g' ${WRKSRC}/lib/wx/configure + # Check if ${JAVAC} exists. .if !defined(WITHOUT_JAVA) @if [ ! -x ${JAVAC} ]; then \ diff --git a/lang/erlang14/files/patch-lib_wx_configure b/lang/erlang14/files/patch-lib_wx_configure new file mode 100644 index 000000000000..8a334f042c0b --- /dev/null +++ b/lang/erlang14/files/patch-lib_wx_configure @@ -0,0 +1,11 @@ +--- lib/wx/configure.orig 2009-06-10 10:35:03.000000000 +0800 ++++ lib/wx/configure 2009-06-10 10:35:23.000000000 +0800 +@@ -3210,7 +3210,7 @@ + ;; + *) + DEBUG_CFLAGS="-g -Wall -fPIC -DDEBUG $CFLAGS" +- CFLAGS="-g -Wall -O2 -fPIC -fomit-frame-pointer -fno-strict-aliasing $CFLAGS" ++ CFLAGS="-Wall -fPIC -fomit-frame-pointer -fno-strict-aliasing $CFLAGS %%CFLAGS%%" + ;; + esac + |