Attachment 150824 Details for Bug 233737 – Use $RPM_OPT_FLAGS

[patch] Use $RPM_OPT_FLAGS

wormux-0.7.9-optflags.patch (text/plain), 2.11 KB, created by Ville Skyttä on 2007-03-24 11:11:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2007-03-24 11:11:54 UTC

Size: 2.11 KB

patch

obsolete

>--- wormux-0.7.9/configure.ac~	2007-01-28 16:06:11.000000000 +0200
>+++ wormux-0.7.9/configure.ac	2007-03-24 12:59:34.000000000 +0200
>@@ -150,11 +150,8 @@
>         GCC_FLAGS="$GCC_FLAGS -O2"
>     fi
> 
>-    dnl Ignore default options set by autoconf
>-    dnl CFLAGS="$CFLAGS $GCC_FLAGS"
>-    CFLAGS="$GCC_FLAGS"
>-    dnl CXXFLAGS="$CXXFLAGS $GCC_FLAGS"
>-    CXXFLAGS="$GCC_FLAGS"
>+    CFLAGS="$GCC_FLAGS $CFLAGS"
>+    CXXFLAGS="$GCC_FLAGS $CXXFLAGS"
> 
> else
>     if test "x${debug}" = "xyes"; then
>--- wormux-0.7.9/configure~	2007-01-28 16:06:58.000000000 +0200
>+++ wormux-0.7.9/configure	2007-03-24 12:59:57.000000000 +0200
>@@ -7319,8 +7319,8 @@
>         GCC_FLAGS="$GCC_FLAGS -O2"
>     fi
> 
>-            CFLAGS="$GCC_FLAGS"
>-        CXXFLAGS="$GCC_FLAGS"
>+            CFLAGS="$GCC_FLAGS $CFLAGS"
>+        CXXFLAGS="$GCC_FLAGS $CXXFLAGS"
> 
> else
>     if test "x${debug}" = "xyes"; then
>--- wormux-0.7.9/src/Makefile.am~	2007-01-28 16:03:48.000000000 +0200
>+++ wormux-0.7.9/src/Makefile.am	2007-03-24 13:03:12.000000000 +0200
>@@ -176,7 +176,7 @@
> 	weapon/blowtorch.cpp weapon/blowtorch.h \
> 	weapon/syringe.cpp weapon/syringe.h
> 
>-AM_CXXFLAGS = -DINSTALL_DATADIR=\"$(pkgdatadir)\" -DINSTALL_LOCALEDIR=\"$(localedir)\" -DFONT_FILE=\"$(fontfile)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -Werror
>+AM_CXXFLAGS = -DINSTALL_DATADIR=\"$(pkgdatadir)\" -DINSTALL_LOCALEDIR=\"$(localedir)\" -DFONT_FILE=\"$(fontfile)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\"
> 
> 
> if WIN32
>--- wormux-0.7.9/src/Makefile.in~	2007-01-28 16:06:57.000000000 +0200
>+++ wormux-0.7.9/src/Makefile.in	2007-03-24 13:03:28.000000000 +0200
>@@ -518,7 +518,7 @@
> 	weapon/submachine_gun.h weapon/polecat.cpp weapon/polecat.h \
> 	weapon/blowtorch.cpp weapon/blowtorch.h weapon/syringe.cpp \
> 	weapon/syringe.h $(am__append_1)
>-AM_CXXFLAGS = -DINSTALL_DATADIR=\"$(pkgdatadir)\" -DINSTALL_LOCALEDIR=\"$(localedir)\" -DFONT_FILE=\"$(fontfile)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -Werror
>+AM_CXXFLAGS = -DINSTALL_DATADIR=\"$(pkgdatadir)\" -DINSTALL_LOCALEDIR=\"$(localedir)\" -DFONT_FILE=\"$(fontfile)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\"
> all: config.h
> 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
>

Actions: View | Diff

Attachments on bug 233737: 150824