57 lines
1.9 KiB
Plaintext
57 lines
1.9 KiB
Plaintext
$OpenBSD: patch-configure,v 1.4 2017/04/27 23:20:29 espie Exp $
|
|
--- configure.orig Wed Jan 5 11:14:02 2000
|
|
+++ configure Fri Apr 28 01:18:56 2017
|
|
@@ -738,7 +738,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 740 "configure"
|
|
#include "confdefs.h"
|
|
-main(){return(0);}
|
|
+int main(){return(0);}
|
|
EOF
|
|
if { (eval echo configure:744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
|
ac_cv_prog_cxx_works=yes
|
|
@@ -1801,43 +1801,6 @@ echo "Ignoring libraries \"$X_PRE_LIBS\" requested by
|
|
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
|
|
|
|
|
|
|