| 1 |
pinkbyte 14/05/03 22:40:26 |
| 2 |
|
| 3 |
Added: rudiments-0.46-buildsystem.patch |
| 4 |
Log: |
| 5 |
Version bump, wrt bug #488108. Update buildsystem patch - respect CFLAGS, migrate to autotools-utils eclass. Drop old versions |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-cpp/rudiments/files/rudiments-0.46-buildsystem.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/rudiments/files/rudiments-0.46-buildsystem.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/rudiments/files/rudiments-0.46-buildsystem.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: rudiments-0.46-buildsystem.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/config.mk.in b/config.mk.in |
| 18 |
index ae29f27..c0b7e3d 100644 |
| 19 |
--- a/config.mk.in |
| 20 |
+++ b/config.mk.in |
| 21 |
@@ -11,7 +11,7 @@ includedir = @includedir@ |
| 22 |
libdir = @libdir@ |
| 23 |
mandir = @mandir@ |
| 24 |
datadir = @datadir@ |
| 25 |
-docdir = ${datadir}/doc/rudiments |
| 26 |
+docdir = @docdir@ |
| 27 |
|
| 28 |
# compiler to use |
| 29 |
CC = @CC@ |
| 30 |
@@ -21,7 +21,7 @@ |
| 31 |
AR = @AR@ |
| 32 |
|
| 33 |
# includes and defines |
| 34 |
-BASECPPFLAGS = @WALL@ @WERROR@ @CPPFLAGS@ @PTHREADINCLUDES@ @SSLINCLUDES@ @PCREINCLUDES@ |
| 35 |
+BASECPPFLAGS = @WALL@ @CPPFLAGS@ @PTHREADINCLUDES@ @SSLINCLUDES@ @PCREINCLUDES@ |
| 36 |
|
| 37 |
# debug and optimization flags (-g, -O2, etc.) |
| 38 |
# NOTE: -FPIC gets added if we're not using libtool |
| 39 |
diff --git a/configure.in b/configure.in |
| 40 |
index d82ea0e..290a80b 100644 |
| 41 |
--- a/configure.in |
| 42 |
+++ b/configure.in |
| 43 |
@@ -28,7 +28,7 @@ AC_ARG_WITH(pthread-prefix, |
| 44 |
PTHREADPATH="") |
| 45 |
AC_ARG_ENABLE(ssl, |
| 46 |
[ --disable-ssl Disable SSL support], |
| 47 |
- ENABLE_RUDIMENTS_SSL="no", |
| 48 |
+ ENABLE_RUDIMENTS_SSL="$enableval", |
| 49 |
ENABLE_RUDIMENTS_SSL="yes") |
| 50 |
AC_ARG_WITH(ssl-includes, |
| 51 |
[ --with-ssl-includes SSL includes], |
| 52 |
@@ -40,7 +40,7 @@ AC_ARG_WITH(ssl-libs, |
| 53 |
SSLLIBS="") |
| 54 |
AC_ARG_ENABLE(pcre, |
| 55 |
[ --disable-pcre Don't use PCRE for regular expressions], |
| 56 |
- ENABLE_RUDIMENTS_PCRE="no", |
| 57 |
+ ENABLE_RUDIMENTS_PCRE="$enableval", |
| 58 |
ENABLE_RUDIMENTS_PCRE="yes") |
| 59 |
AC_ARG_WITH(pcre-includes, |
| 60 |
[ --with-pcre-includes PCRE includes], |
| 61 |
@@ -56,7 +56,7 @@ AC_ARG_ENABLE(built-in-regex, |
| 62 |
USE_BUILT_IN_REGULAREXPRESSION="0") |
| 63 |
AC_ARG_ENABLE(threads, |
| 64 |
[ --disable-threads Disable thread support], |
| 65 |
- ENABLE_RUDIMENTS_THREADS="no"; INCLUDE_THREAD="0"; INCLUDE_THREADMUTEX="0", |
| 66 |
+ ENABLE_RUDIMENTS_THREADS="$enableval"; INCLUDE_THREAD="0"; INCLUDE_THREADMUTEX="0", |
| 67 |
ENABLE_RUDIMENTS_THREADS="yes") |
| 68 |
|
| 69 |
dnl options to disable building various classes |
| 70 |
@@ -3716,6 +3716,10 @@ if ( test "`echo $datadir | cut -c1`" = "/" ) |
| 71 |
then |
| 72 |
datadir='${DESTDIR}'"$datadir" |
| 73 |
fi |
| 74 |
+if ( test "`echo $docdir | cut -c1`" = "/" ) |
| 75 |
+then |
| 76 |
+ docdir='${DESTDIR}'"$docdir" |
| 77 |
+fi |
| 78 |
|
| 79 |
|
| 80 |
dnl Output files. |
| 81 |
diff --git a/src/Makefile.in b/src/Makefile.in |
| 82 |
index a224d83..3b990fb 100644 |
| 83 |
--- a/src/Makefile.in |
| 84 |
+++ b/src/Makefile.in |
| 85 |
@@ -4,7 +4,7 @@ include ../config.mk |
| 86 |
|
| 87 |
.PHONY: all clean install uninstall |
| 88 |
|
| 89 |
-CPPFLAGS = $(WERROR) $(BASECPPFLAGS) -I../ -I../include @EXTRACPPFLAGS@ |
| 90 |
+CPPFLAGS = $(BASECPPFLAGS) -I../ -I../include @EXTRACPPFLAGS@ |
| 91 |
|
| 92 |
SRCS = namevaluepairs.cpp winsock.cpp @SRCS@ |
| 93 |
LOBJS = namevaluepairs.lo winsock.lo @LOBJS@ |
| 94 |
--- a/acsite.m4 2014-05-04 01:44:03.265919456 +0400 |
| 95 |
+++ b/acsite.m4 2014-05-04 01:44:34.008920936 +0400 |
| 96 |
@@ -266,7 +237,7 @@ |
| 97 |
dnl Sometimes -Wall includes -Wunused-variables and -Wunused-parameters |
| 98 |
dnl which we don't care about. Disable it if it does. |
| 99 |
OLDCPPFLAGS=$CPPFLAGS |
| 100 |
- CPPFLAGS="$WALL $WERROR $CPPFLAGS" |
| 101 |
+ CPPFLAGS="$WALL $CPPFLAGS" |
| 102 |
AC_MSG_CHECKING(whether -Wall includes -Wunused-*) |
| 103 |
AC_TRY_COMPILE([void f(int a) { return; }],[f(1);],AC_MSG_RESULT(no),WALL=""; AC_MSG_RESULT(yes)) |
| 104 |
CPPFLAGS=$OLDCPPFLAGS |
Archives