pinkbyte 15/07/28 09:50:39 Added: rudiments-0.51-buildsystem.patch Log: Version bump, wrt bug #551014. Thanks to Mansour <mansour.alakeel AT gmail.com> for pointing on this issue (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x60C0742D1F357D42)
Revision Changes Path 1.1 dev-cpp/rudiments/files/rudiments-0.51-buildsystem.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/rudiments/files/rudiments-0.51-buildsystem.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/rudiments/files/rudiments-0.51-buildsystem.patch?rev=1.1&content-type=text/plain Index: rudiments-0.51-buildsystem.patch =================================================================== diff --git a/config.mk.in b/config.mk.in index ae29f27..c0b7e3d 100644 --- a/config.mk.in +++ b/config.mk.in @@ -9,7 +9,7 @@ includedir = @includedir@ libdir = @libdir@ mandir = @mandir@ datadir = @datadir@ -docdir = ${datadir}/doc/rudiments +docdir = @docdir@ # command separator AND = ; @@ -25,7 +25,7 @@ CXX = @CXX@ COMPILE = -c OUT = -o -BASECPPFLAGS = @WALL@ @WERROR@ @WNOLONGDOUBLE@ @WNOFORMAT@ @WNOOVERLOADEDVIRTUAL@ @CPPFLAGS@ @PTHREADINCLUDES@ @SSLINCLUDES@ @PCREINCLUDES@ +BASECPPFLAGS = @WALL@ @WNOLONGDOUBLE@ @WNOFORMAT@ @WNOOVERLOADEDVIRTUAL@ @CPPFLAGS@ @PTHREADINCLUDES@ @SSLINCLUDES@ @PCREINCLUDES@ EXPORTSCPPFLAGS = EXTRACPPFLAGS = @EXTRACPPFLAGS@ CXXFLAGS = @CXXFLAGS@ @PIPE@ diff --git a/configure.ac b/configure.ac index d82ea0e..290a80b 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ AC_ARG_WITH(pthread-prefix, PTHREADPATH="") AC_ARG_ENABLE(ssl, [ --disable-ssl Disable SSL support], - ENABLE_RUDIMENTS_SSL="no", + ENABLE_RUDIMENTS_SSL="$enableval", ENABLE_RUDIMENTS_SSL="yes") AC_ARG_WITH(ssl-includes, [ --with-ssl-includes SSL includes], @@ -44,7 +44,7 @@ AC_ARG_WITH(ssl-libs, SSLLIBS="") AC_ARG_ENABLE(pcre, [ --disable-pcre Don't use PCRE for regular expressions], - ENABLE_RUDIMENTS_PCRE="no", + ENABLE_RUDIMENTS_PCRE="$enableval", ENABLE_RUDIMENTS_PCRE="yes") AC_ARG_WITH(pcre-includes, [ --with-pcre-includes PCRE includes], @@ -60,7 +60,7 @@ AC_ARG_ENABLE(built-in-regex, USE_BUILT_IN_REGULAREXPRESSION="0") AC_ARG_ENABLE(threads, [ --disable-threads Disable thread support], - ENABLE_RUDIMENTS_THREADS="no"; INCLUDE_THREAD="0", + ENABLE_RUDIMENTS_THREADS="$enableval"; INCLUDE_THREAD="0", ENABLE_RUDIMENTS_THREADS="yes") dnl options to disable building various classes @@ -4034,6 +4034,10 @@ if ( test "`echo $datadir | cut -c1`" = "/" ) then datadir='${DESTDIR}'"$datadir" fi +if ( test "`echo $docdir | cut -c1`" = "/" ) +then + docdir='${DESTDIR}'"$docdir" +fi dnl Output files. diff --git a/src/Makefile.in b/src/Makefile.in index a224d83..3b990fb 100644 @@ -2,7 +2,7 @@ include ../config.mk -CPPFLAGS = $(WERROR) $(BASECPPFLAGS) $(EXPORTSCPPFLAGS) $(INC)../ $(INC)../include $(EXTRACPPFLAGS) +CPPFLAGS = $(BASECPPFLAGS) $(EXPORTSCPPFLAGS) $(INC)../ $(INC)../include $(EXTRACPPFLAGS) LIBS = $(SOCKETLIBS) $(PTHREADLIB) $(SSLLIBS) $(PCRELIBS) $(NANOSLEEPLIB) $(CLOCKNANOSLEEPLIB) $(SHMOPENLIB) $(CRYPTLIB) $(INETATONLIB) $(NETAPI32LIB) $(BELIB) $(GNULIB) $(CRTLIB) $(DLLIB) $(DEBUGLIB) SRCS = @SRCS@ --- a/acsite.m4 2014-05-04 01:44:03.265919456 +0400 +++ b/acsite.m4 2014-05-04 01:44:34.008920936 +0400 @@ -279,7 +250,7 @@ dnl Sometimes -Wall includes -Wunused-variables and -Wunused-parameters dnl which we don't care about. Disable it if it does. OLDCPPFLAGS=$CPPFLAGS - CPPFLAGS="$WALL $WERROR $CPPFLAGS" + CPPFLAGS="$WALL $CPPFLAGS" AC_MSG_CHECKING(whether -Wall includes -Wunused-*) AC_TRY_COMPILE([void f(int a) { return; }],[f(1);],AC_MSG_RESULT(no),WALL=""; AC_MSG_RESULT(yes)) CPPFLAGS=$OLDCPPFLAGS
