From 97412e5522599381725f64c2c9e016c3abf8fee3 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 8 Jun 2011 23:01:31 +0000 Subject: [PATCH] Use %{_target_cpu} to support both i386 and x86_64. --- nmap.spec.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nmap.spec.in b/nmap.spec.in index ff62df59c..a4ee25cb3 100644 --- a/nmap.spec.in +++ b/nmap.spec.in @@ -53,12 +53,12 @@ both console and graphical versions are available. # compat-glibc and compat-gcc-34-c++. CC=gcc34; export CC CXX=g++34; export CXX -CPPFLAGS="-I/usr/lib/i386-redhat-linux4E/include -B/usr/lib/i386-redhat-linux4E/lib/ $CPPFLAGS"; export CPPFLAGS -CFLAGS="-I/usr/lib/i386-redhat-linux4E/include -B/usr/lib/i386-redhat-linux4E/lib/ $CFLAGS"; export CFLAGS -CXXFLAGS="-I/usr/lib/i386-redhat-linux4E/include -B/usr/lib/i386-redhat-linux4E/lib/ $CXXFLAGS"; export CXXFLAGS +CPPFLAGS="-I/usr/lib/%{_target_cpu}-redhat-linux4E/include -B/usr/lib/%{_target_cpu}-redhat-linux4E/lib/ $CPPFLAGS"; export CPPFLAGS +CFLAGS="-I/usr/lib/%{_target_cpu}-redhat-linux4E/include -B/usr/lib/%{_target_cpu}-redhat-linux4E/lib/ $CFLAGS"; export CFLAGS +CXXFLAGS="-I/usr/lib/%{_target_cpu}-redhat-linux4E/include -B/usr/lib/%{_target_cpu}-redhat-linux4E/lib/ $CXXFLAGS"; export CXXFLAGS # Settings LDFLAGS seems logical but leads to an error on C++ link: # /usr/lib/gcc/i386-redhat-linux/3.4.6/libgcc_s.so: undefined reference to `__stack_chk_fail@GLIBC_2.4' -# LDFLAGS="-B/usr/lib/i386-redhat-linux4E/lib/ $LDFLAGS"; export LDFLAGS +# LDFLAGS="-B/usr/lib/%{_target_cpu}-redhat-linux4E/lib/ $LDFLAGS"; export LDFLAGS %configure --with-openssl=%{openssl} --without-zenmap --with-ndiff --with-libdnet=included --with-libpcap=included --with-libpcre=included --with-liblua=included %if "%{buildncat}" == "0"