diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-13 17:18:15 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-13 17:18:15 +0200 |
| commit | 64d6047788b6201a9b026a6841dd25f8d0a0d00b (patch) | |
| tree | 95aafc346b70447f7dd2829f83f59d8df15d4d58 /package/socat/patches | |
| parent | d5aed1c97f81f422af91c1bd4d7994dc54beabe1 (diff) | |
| parent | 7297ef1c47935fb17e49cac8379908e631763566 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/socat/patches')
| -rw-r--r-- | package/socat/patches/patch-Makefile_in (renamed from package/socat/patches/501-honor_ldflags.patch) | 5 | ||||
| -rw-r--r-- | package/socat/patches/patch-configure | 23 |
2 files changed, 25 insertions, 3 deletions
diff --git a/package/socat/patches/501-honor_ldflags.patch b/package/socat/patches/patch-Makefile_in index 87c777067..e8e979607 100644 --- a/package/socat/patches/501-honor_ldflags.patch +++ b/package/socat/patches/patch-Makefile_in @@ -1,6 +1,5 @@ -diff -ruN socat-1.4-old/Makefile.in socat-1.4-new/Makefile.in ---- socat-1.7.2.2.orig/Makefile.in 2011-12-06 08:45:03.000000000 +0100 -+++ socat-1.7.2.2/Makefile.in 2013-12-24 16:37:21.000000000 +0100 +--- socat-1.7.2.4.orig/Makefile.in 2014-03-09 15:48:44.000000000 +0100 ++++ socat-1.7.2.4/Makefile.in 2014-03-22 12:13:46.000000000 +0100 @@ -38,7 +38,8 @@ INSTALL = @INSTALL@ #0 CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(INCLS) diff --git a/package/socat/patches/patch-configure b/package/socat/patches/patch-configure new file mode 100644 index 000000000..75b014290 --- /dev/null +++ b/package/socat/patches/patch-configure @@ -0,0 +1,23 @@ +--- socat-1.7.2.4.orig/configure 2014-03-09 20:57:51.000000000 +0100 ++++ socat-1.7.2.4/configure 2014-03-22 12:20:13.000000000 +0100 +@@ -3347,18 +3347,8 @@ fi + # fail + + +- +-if test "$CC" = "gcc"; then +- CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -Wno-parentheses" +- ERRONWARN="-Werror -O0" +-elif test "$CC" = "clang"; then +- CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -Wno-parentheses" +- ERRONWARN="-Werror -O0" +-#elif Sun Studio +-# ERRONWARN="-errwarn" +-else +- ERRONWARN= +-fi ++CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -Wno-parentheses" ++ERRONWARN="-Werror -O0" + export CFLAGS + + |