From e2825c96590aad673164b31375cb9224fdaa92e1 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 2 Jan 2012 00:19:54 +0000 Subject: [PATCH] No longer use compat-gcc and compat-glibc in the RPM spec. This may not be necessary anymore, and for the moment it prevents linking with libsvn on CentOS, because that library and others use -fstack-protector, which compat-glibc and compat-gcc are ignorant of. --- nmap.spec.in | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/nmap.spec.in b/nmap.spec.in index caf099dcc..b7ca53e5a 100644 --- a/nmap.spec.in +++ b/nmap.spec.in @@ -49,16 +49,6 @@ both console and graphical versions are available. %setup -q %build -# Link with compatibility Glibc 2.3.4 CentOS packages -# compat-glibc and compat-gcc-34-c++. -CC=gcc34; export CC -CXX=g++34; export CXX -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/%{_target_cpu}-redhat-linux4E/lib/ $LDFLAGS"; export LDFLAGS %configure --with-openssl=%{openssl} --without-zenmap --with-ndiff --with-nmap-update --with-libdnet=included --with-libpcap=included --with-libpcre=included --with-liblua=included %if "%{buildncat}" == "0"