1 |
pinkbyte 15/07/28 09:50:39 |
2 |
|
3 |
Added: rudiments-0.51-buildsystem.patch |
4 |
Log: |
5 |
Version bump, wrt bug #551014. Thanks to Mansour <mansour.alakeel AT gmail.com> for pointing on this issue |
6 |
|
7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x60C0742D1F357D42) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-cpp/rudiments/files/rudiments-0.51-buildsystem.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/rudiments/files/rudiments-0.51-buildsystem.patch?rev=1.1&view=markup |
13 |
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 |
14 |
|
15 |
Index: rudiments-0.51-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 |
@@ -9,7 +9,7 @@ includedir = @includedir@ |
22 |
libdir = @libdir@ |
23 |
mandir = @mandir@ |
24 |
datadir = @datadir@ |
25 |
-docdir = ${datadir}/doc/rudiments |
26 |
+docdir = @docdir@ |
27 |
|
28 |
# command separator |
29 |
AND = ; |
30 |
@@ -25,7 +25,7 @@ |
31 |
CXX = @CXX@ |
32 |
COMPILE = -c |
33 |
OUT = -o |
34 |
-BASECPPFLAGS = @WALL@ @WERROR@ @WNOLONGDOUBLE@ @WNOFORMAT@ @WNOOVERLOADEDVIRTUAL@ @CPPFLAGS@ @PTHREADINCLUDES@ @SSLINCLUDES@ @PCREINCLUDES@ |
35 |
+BASECPPFLAGS = @WALL@ @WNOLONGDOUBLE@ @WNOFORMAT@ @WNOOVERLOADEDVIRTUAL@ @CPPFLAGS@ @PTHREADINCLUDES@ @SSLINCLUDES@ @PCREINCLUDES@ |
36 |
EXPORTSCPPFLAGS = |
37 |
EXTRACPPFLAGS = @EXTRACPPFLAGS@ |
38 |
CXXFLAGS = @CXXFLAGS@ @PIPE@ |
39 |
diff --git a/configure.ac b/configure.ac |
40 |
index d82ea0e..290a80b 100644 |
41 |
--- a/configure.ac |
42 |
+++ b/configure.ac |
43 |
@@ -32,7 +32,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 |
@@ -44,7 +44,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 |
@@ -60,7 +60,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", |
66 |
+ ENABLE_RUDIMENTS_THREADS="$enableval"; INCLUDE_THREAD="0", |
67 |
ENABLE_RUDIMENTS_THREADS="yes") |
68 |
|
69 |
dnl options to disable building various classes |
70 |
@@ -4034,6 +4034,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 |
@@ -2,7 +2,7 @@ |
84 |
|
85 |
include ../config.mk |
86 |
|
87 |
-CPPFLAGS = $(WERROR) $(BASECPPFLAGS) $(EXPORTSCPPFLAGS) $(INC)../ $(INC)../include $(EXTRACPPFLAGS) |
88 |
+CPPFLAGS = $(BASECPPFLAGS) $(EXPORTSCPPFLAGS) $(INC)../ $(INC)../include $(EXTRACPPFLAGS) |
89 |
LIBS = $(SOCKETLIBS) $(PTHREADLIB) $(SSLLIBS) $(PCRELIBS) $(NANOSLEEPLIB) $(CLOCKNANOSLEEPLIB) $(SHMOPENLIB) $(CRYPTLIB) $(INETATONLIB) $(NETAPI32LIB) $(BELIB) $(GNULIB) $(CRTLIB) $(DLLIB) $(DEBUGLIB) |
90 |
|
91 |
SRCS = @SRCS@ |
92 |
--- a/acsite.m4 2014-05-04 01:44:03.265919456 +0400 |
93 |
+++ b/acsite.m4 2014-05-04 01:44:34.008920936 +0400 |
94 |
@@ -279,7 +250,7 @@ |
95 |
dnl Sometimes -Wall includes -Wunused-variables and -Wunused-parameters |
96 |
dnl which we don't care about. Disable it if it does. |
97 |
OLDCPPFLAGS=$CPPFLAGS |
98 |
- CPPFLAGS="$WALL $WERROR $CPPFLAGS" |
99 |
+ CPPFLAGS="$WALL $CPPFLAGS" |
100 |
AC_MSG_CHECKING(whether -Wall includes -Wunused-*) |
101 |
AC_TRY_COMPILE([void f(int a) { return; }],[f(1);],AC_MSG_RESULT(no),WALL=""; AC_MSG_RESULT(yes)) |
102 |
CPPFLAGS=$OLDCPPFLAGS |