summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2016-01-31 20:16:48 +0100
committerDavid Seifert <soap@gentoo.org>2016-01-31 20:17:07 +0100
commit4b8e9ca20e6f300b2d0e18d2311690d0415699d0 (patch)
tree2c6969370b5ea054c102ba79e3abe1b36dd644b7 /media-libs/sdif/files
parentskel.metadata.xml: update for GLEP 67 (diff)
downloadgentoo-4b8e9ca20e6f300b2d0e18d2311690d0415699d0.tar.gz
gentoo-4b8e9ca20e6f300b2d0e18d2311690d0415699d0.tar.bz2
gentoo-4b8e9ca20e6f300b2d0e18d2311690d0415699d0.zip
media-libs/sdif: Version bump to 3.11.4
Gentoo-Bug: 572686 * EAPI=6 * Remove USE="doc" Package-Manager: portage-2.2.27
Diffstat (limited to 'media-libs/sdif/files')
-rw-r--r--media-libs/sdif/files/sdif-3.11.4-fix-buildsystem.patch60
1 files changed, 60 insertions, 0 deletions
diff --git a/media-libs/sdif/files/sdif-3.11.4-fix-buildsystem.patch b/media-libs/sdif/files/sdif-3.11.4-fix-buildsystem.patch
new file mode 100644
index 000000000000..162976c6ab45
--- /dev/null
+++ b/media-libs/sdif/files/sdif-3.11.4-fix-buildsystem.patch
@@ -0,0 +1,60 @@
+Remove hardcoded CFLAGS, fix broken example generation.
+
+--- SDIF-3.11.4-src/configure.ac
++++ SDIF-3.11.4-src/configure.ac
+@@ -518,15 +518,15 @@
+ [--enable-debug support additional library/programs with debug enabled],
+ [echo FEATURE enable-debug... $enableval;
+ if test "$enableval" = "yes"; then
+- SELLIB=libsdif-debug.la; CFLAGS="$EXTERNAL_CFLAGS -g2 -Wall";
++ SELLIB=libsdif-debug.la;
+ PROGLIST="querysdif-debug\$(EXEEXT) sdifextract-debug\$(EXEEXT) sdiftotext-debug\$(EXEEXT) tosdif-debug\$(EXEEXT)";
+
+ else
+- SELLIB=libsdif.la; CFLAGS="$EXTERNAL_CFLAGS -O3";
++ SELLIB=libsdif.la;
+ PROGLIST="querysdif\$(EXEEXT) sdifextract\$(EXEEXT) sdiftotext\$(EXEEXT) tosdif\$(EXEEXT)";
+ fi ],
+ [
+-SELLIB=libsdif.la; CFLAGS="$EXTERNAL_CFLAGS -O3";
++SELLIB=libsdif.la;
+ PROGLIST="querysdif\$(EXEEXT) sdifextract\$(EXEEXT) sdiftotext\$(EXEEXT) tosdif\$(EXEEXT)";
+ ])
+
+@@ -538,7 +538,7 @@
+ [--enable-profile generate additional library/programs with profiling output enabled],
+ [echo FEATURE enable-profile... $enableval;
+ if test "$enableval" = "yes"; then
+- SELLIB=libsdif-profile.la; CFLAGS="$CFLAGS -g -pg -fprofile-arcs";
++ SELLIB=libsdif-profile.la;
+ PROGLIST="querysdif-profile\$(EXEEXT) sdifextract-profile\$(EXEEXT) sdiftotext-profile\$(EXEEXT) tosdif-profile\$(EXEEXT)";
+ dnl else use the one selected above
+ fi ],
+--- SDIF-3.11.4-src/examples/Makefile.am
++++ SDIF-3.11.4-src/examples/Makefile.am
+@@ -18,18 +18,14 @@
+ # trying to add source code to dist, not working yet
+ #
+
+-INCLUDES = -I../include -I$(top_srcdir)/include -I$(top_srcdir)/sdif
+-CFLAGS = @CFLAGS@ '-DVERSION="$(VERSION)"'
++AM_CPPFLAGS = -I../include -I$(top_srcdir)/include -I$(top_srcdir)/sdif
++AM_CFLAGS = '-DVERSION="$(VERSION)"' @PTHREAD_CFLAGS@
+
+-libsdif = $(top_srcdir)/sdif/.libs/libsdif.a
++bin_PROGRAMS = list-types list-nvt
+
+-# this is for automake
+-EXTRA_DIST = list-types.c list-nvt.c
++list_types_SOURCES = list-types.c
++list_types_LDADD = $(top_srcdir)/sdif/.libs/libsdif.a @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+
+-all: list-types list-nvt
++list_nvt_SOURCES = list-nvt.c
++list_nvt_LDADD = $(top_srcdir)/sdif/.libs/libsdif.a @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+
+-list-types: list-types.c $(libsdif)
+- gcc -I../include -g -o $@ $^
+-
+-list-nvt: list-nvt.c $(libsdif)
+- gcc $(LDFLAGS) -I../include -g -o $@ $^