cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

respect CXXFLAGS, ok naddy@

Browse Source
This commit is contained in:
wilfried 2001-03-26 09:14:41 +00:00
parent f926ed4675
commit 38f1cca819
4 changed files with 112 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/flwm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2000/11/29 12:29:09 kevlo Exp $
# $OpenBSD: Makefile,v 1.10 2001/03/26 09:14:41 wilfried Exp $
DISTNAME= flwm-1.00
PKGNAME= flwm-1.0.0
@ -12,7 +12,7 @@ MAINTAINER= Jason Wright <jason@openbsd.org>
EXTRACT_SUFX= .tgz
CONFIGURE_STYLE=gnu dest
CONFIGURE_ENV= CXXFLAGS="-I${LOCALBASE}/include" \
CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
NO_SHARED_LIBS= Yes

47
x11/flwm/patches/patch-configure Normal file
View File

@ -0,0 +1,47 @@
$OpenBSD: patch-configure,v 1.3 2001/03/26 09:14:42 wilfried Exp $
--- configure.orig Wed Jan 5 11:14:02 2000
+++ configure Fri Mar 16 17:42:11 2001
@@ -1802,43 +1802,6 @@ LIBS="$LIBS$X_LIBS"
MAKEDEPEND="\$(CXX) -M"
-if test -n "$GXX"; then
- # GNU C compiler
- # -Wno-return-type is necessary for Xlib header files on many systems:
- CFLAGS="$CFLAGS -Wall -Wno-return-type -O2 $X_CFLAGS"
- CFLAGS_D="$CFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
- CXXFLAGS="$CXXFLAGS -Wall -Wno-return-type -O2 $X_CFLAGS"
- CXXFLAGS_D="$CXXFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
-else
-if test "`(uname) 2>/dev/null`" = IRIX; then
- if expr "`(uname -r)`" \>= 6.2; then
- # turn on new "n32" Irix compiler:
- CXX="CC -n32"
- CC="cc -n32"
- LD="ld -n32"
- # but -M is broken so use old compiler:
- MAKEDEPEND="CC -M"
- # -woff 3322 is necessary due to errors in Xlib headers on IRIX
- CFLAGS="$CFLAGS -fullwarn -O2 $X_CFLAGS"
- CFLAGS_D="$CFLAGS -fullwarn -gslim -DDEBUG $X_CFLAGS"
- CXXFLAGS="$CXXFLAGS -fullwarn -woff 3322 -O2 $X_CFLAGS"
- CXXFLAGS_D="$CXXFLAGS -fullwarn -woff 3322 -gslim -DDEBUG $X_CFLAGS"
- else
- # old Irix compiler:
- CFLAGS="$CFLAGS -O2 $X_CFLAGS"
- CFLAGS_D="$CFLAGS -g -DDEBUG $X_CFLAGS"
- CXXFLAGS="$CXXFLAGS +w +pp -O2 $X_CFLAGS"
- CXXFLAGS_D="$CXXFLAGS +w +pp -g -DDEBUG $X_CFLAGS"
- fi
-else
- # generic C compiler:
- CFLAGS="$CFLAGS -O $X_CFLAGS"
- CFLAGS_D="$CFLAGS -g -DDEBUG $X_CFLAGS"
- CXXFLAGS="$CXXFLAGS -O $X_CFLAGS"
- CXXFLAGS_D="$CXXFLAGS -g -DDEBUG $X_CFLAGS"
-fi
-fi
-
trap '' 1 2 15

48
x11/flwm/patches/patch-configure_in Normal file
View File

@ -0,0 +1,48 @@
$OpenBSD: patch-configure_in,v 1.1 2001/03/26 09:14:42 wilfried Exp $
--- configure.in.orig Wed Jan 5 11:14:02 2000
+++ configure.in Fri Mar 16 17:41:55 2001
@@ -13,44 +13,6 @@ LIBS="$LIBS$X_LIBS"
MAKEDEPEND="\$(CXX) -M"
-dnl# add warnings and optimization to compiler switches:
-dnl# do this last so messing with switches does not break tests
-if test -n "$GXX"; then
- # GNU C compiler
- # -Wno-return-type is necessary for Xlib header files on many systems:
- CFLAGS="$CFLAGS -Wall -Wno-return-type -O2 $X_CFLAGS"
- CFLAGS_D="$CFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
- CXXFLAGS="$CXXFLAGS -Wall -Wno-return-type -O2 $X_CFLAGS"
- CXXFLAGS_D="$CXXFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
-else
-if test "`(uname) 2>/dev/null`" = IRIX; then
- if expr "`(uname -r)`" \>= 6.2; then
- # turn on new "n32" Irix compiler:
- CXX="CC -n32"
- CC="cc -n32"
- LD="ld -n32"
- # but -M is broken so use old compiler:
- MAKEDEPEND="CC -M"
- # -woff 3322 is necessary due to errors in Xlib headers on IRIX
- CFLAGS="$CFLAGS -fullwarn -O2 $X_CFLAGS"
- CFLAGS_D="$CFLAGS -fullwarn -gslim -DDEBUG $X_CFLAGS"
- CXXFLAGS="$CXXFLAGS -fullwarn -woff 3322 -O2 $X_CFLAGS"
- CXXFLAGS_D="$CXXFLAGS -fullwarn -woff 3322 -gslim -DDEBUG $X_CFLAGS"
- else
- # old Irix compiler:
- CFLAGS="$CFLAGS -O2 $X_CFLAGS"
- CFLAGS_D="$CFLAGS -g -DDEBUG $X_CFLAGS"
- CXXFLAGS="$CXXFLAGS +w +pp -O2 $X_CFLAGS"
- CXXFLAGS_D="$CXXFLAGS +w +pp -g -DDEBUG $X_CFLAGS"
- fi
-else
- # generic C compiler:
- CFLAGS="$CFLAGS -O $X_CFLAGS"
- CFLAGS_D="$CFLAGS -g -DDEBUG $X_CFLAGS"
- CXXFLAGS="$CXXFLAGS -O $X_CFLAGS"
- CXXFLAGS_D="$CXXFLAGS -g -DDEBUG $X_CFLAGS"
-fi
-fi
AC_SUBST(MAKEDEPEND)
AC_SUBST(CFLAGS_D)
AC_SUBST(CXXFLAGS_D)

15
x11/flwm/patches/patch-makeinclude_in Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-makeinclude_in,v 1.1 2001/03/26 09:14:43 wilfried Exp $
--- makeinclude.in.orig Sat Jan 9 20:48:33 1999
+++ makeinclude.in Fri Mar 16 17:43:44 2001
@@ -15,9 +15,9 @@ CC =@CC@
MAKEDEPEND =@MAKEDEPEND@
# flags for C++ compiler:
-CFLAGS =@CFLAGS@
+CFLAGS =@CFLAGS@ @X_CFLAGS@
CFLAGS_D =@CFLAGS_D@
-CXXFLAGS =@CXXFLAGS@
+CXXFLAGS =@CXXFLAGS@ @X_CFLAGS@
CXXFLAGS_D =@CXXFLAGS_D@
# libraries to link with: