kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove dependency on GCC 4.3: allow proper CFLAGS to reach lib/wx/configure.

Browse source 
Obtained from:	vanilla
This commit is contained in:
Jimmy Olgeni 2009-06-10 15:57:29 +00:00
parent c7c5c72d9f
commit 9b534d30b7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=235548
4 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lang/erlang/Makefile
View file

@ -57,7 +57,6 @@ CONFIGURE_ARGS+= --with-wx-config=${WX_CONFIG}
.endif .endif
.endif .endif
USE_GCC= 4.3
USE_GMAKE= yes USE_GMAKE= yes
USE_PERL5= yes USE_PERL5= yes
USE_RC_SUBR= epmd.sh USE_RC_SUBR= epmd.sh
@ -106,6 +105,8 @@ MAN4PREFIX= ${PREFIX}/lib/erlang
MAN6PREFIX= ${PREFIX}/lib/erlang MAN6PREFIX= ${PREFIX}/lib/erlang
pre-configure: pre-configure:
@${REINPLACE_CMD} -e 's#%%CFLAGS%%#${CFLAGS}#g' ${WRKSRC}/lib/wx/configure
# Check if ${JAVAC} exists. # Check if ${JAVAC} exists.
.if !defined(WITHOUT_JAVA) .if !defined(WITHOUT_JAVA)
@if [ ! -x ${JAVAC} ]; then \ @if [ ! -x ${JAVAC} ]; then \

11
lang/erlang/files/patch-lib_wx_configure Normal file
View file

@ -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

3
lang/erlang14/Makefile
View file

@ -57,7 +57,6 @@ CONFIGURE_ARGS+= --with-wx-config=${WX_CONFIG}
.endif .endif
.endif .endif
USE_GCC= 4.3
USE_GMAKE= yes USE_GMAKE= yes
USE_PERL5= yes USE_PERL5= yes
USE_RC_SUBR= epmd.sh USE_RC_SUBR= epmd.sh
@ -106,6 +105,8 @@ MAN4PREFIX= ${PREFIX}/lib/erlang
MAN6PREFIX= ${PREFIX}/lib/erlang MAN6PREFIX= ${PREFIX}/lib/erlang
pre-configure: pre-configure:
@${REINPLACE_CMD} -e 's#%%CFLAGS%%#${CFLAGS}#g' ${WRKSRC}/lib/wx/configure
# Check if ${JAVAC} exists. # Check if ${JAVAC} exists.
.if !defined(WITHOUT_JAVA) .if !defined(WITHOUT_JAVA)
@if [ ! -x ${JAVAC} ]; then \ @if [ ! -x ${JAVAC} ]; then \

11
lang/erlang14/files/patch-lib_wx_configure Normal file
View file

@ -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