diff options
| author |   Thomas Beierlein <tomjbe@gentoo.org> | 2009-09-09 06:11:46 +0000 |
|---|---|---|
| committer | Thomas Beierlein <tomjbe@gentoo.org> | 2009-09-09 06:11:46 +0000 |
| commit | 5493933127fd096ca3adedef50f620b98900230f (patch) | |
| tree | 9e94283ad60fdd9f60e6e8feaacf83d314436842 /media-radio/unixcw/files | |
| parent | app-misc/mswinurl_launcher: New package for bug #283698 - thanks to ssuominen... (diff) | |
| download | sunrise-5493933127fd096ca3adedef50f620b98900230f.tar.gz sunrise-5493933127fd096ca3adedef50f620b98900230f.tar.bz2 sunrise-5493933127fd096ca3adedef50f620b98900230f.zip | |
media-radio/unixcw: fix for some parallel make issues and -fPIC problems
svn path=/sunrise/; revision=9199
Diffstat (limited to 'media-radio/unixcw/files')
| -rw-r--r-- | media-radio/unixcw/files/unixcw-2.3-destdir.patch | 6 | ||||
| -rw-r--r-- | media-radio/unixcw/files/unixcw-2.3-fPIC.patch | 60 | ||||
| -rw-r--r-- | media-radio/unixcw/files/unixcw-2.3-parallel-make.patch | 11 |
3 files changed, 75 insertions, 2 deletions
diff --git a/media-radio/unixcw/files/unixcw-2.3-destdir.patch b/media-radio/unixcw/files/unixcw-2.3-destdir.patch index 91f8a1bc0..195b66505 100644 --- a/media-radio/unixcw/files/unixcw-2.3-destdir.patch +++ b/media-radio/unixcw/files/unixcw-2.3-destdir.patch @@ -1,6 +1,6 @@ --- Makefile.inc.in.org 2008-05-01 09:49:18.000000000 +0200 +++ Makefile.inc.in 2008-05-01 09:49:40.000000000 +0200 -@@ -42,9 +42,9 @@ +@@ -42,9 +42,10 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ @@ -11,4 +11,6 @@ bindir = @bindir@ -mandir = @mandir@ +mandir = $(DESTDIR)@mandir@ - libdir = @libdir@ +-libdir = @libdir@ ++libdir = $(DESTDIR)@libdir@ ++datarootdir = @datarootdir@ diff --git a/media-radio/unixcw/files/unixcw-2.3-fPIC.patch b/media-radio/unixcw/files/unixcw-2.3-fPIC.patch new file mode 100644 index 000000000..67e68bfec --- /dev/null +++ b/media-radio/unixcw/files/unixcw-2.3-fPIC.patch @@ -0,0 +1,60 @@ +--- configure.ac.orig 2009-09-08 22:27:33.000000000 +0200 ++++ configure.ac 2009-09-08 22:28:14.000000000 +0200 +@@ -212,7 +212,7 @@ + cat >conftest.c <<-EOF + int so_test() { return 0; } + EOF +- $CC -c conftest.c >/dev/null 2>/dev/null ++ $CC $CFLAG_PIC -c conftest.c >/dev/null 2>/dev/null + $CC -shared -o conftest.so conftest.o >/dev/null 2>/dev/null + rm -f conftest.c conftest.o + if test -f conftest.so ; then +@@ -239,7 +239,7 @@ + cat >conftest.c <<-EOF + int so_test() { return 0; } + EOF +- $CC -c conftest.c >/dev/null 2>/dev/null ++ $CC $CFLAG_PIC -c conftest.c >/dev/null 2>/dev/null + $LD -G -o conftest.so conftest.o >/dev/null 2>/dev/null + rm -f conftest.c conftest.o + if test -f conftest.so ; then +--- src/cwlib/Makefile.orig 2009-09-08 22:53:31.000000000 +0200 ++++ src/cwlib/Makefile 2009-09-08 22:59:31.000000000 +0200 +@@ -19,7 +19,8 @@ + + include ../../Makefile.inc + CC = $(AC_CC) +-CFLAGS = $(AC_CFLAGS) $(AC_CFLAG_PIC) $(AC_DEFS) ++CFLAGS = $(AC_CFLAGS) $(AC_DEFS) ++CFLAGS_SL = $(AC_CFLAGS) $(AC_CFLAG_PIC) $(AC_DEFS) + AWK = $(AC_AWK) + RANLIB = $(AC_RANLIB) + LD = $(AC_LD) +@@ -40,14 +41,14 @@ + rm -f libcw.a; ar -cr libcw.a cwlib.o + $(RANLIB) libcw.a + +-libcw.so.0.0.0: cwlib.o ++libcw.so.0.0.0: cwlib_sl.o + if [ "$(CC_LINKS_SO)" = "yes" ]; then \ + $(CC) $(LDFLAGS) -shared -Wl,-soname,libcw.so.0 \ +- -o libcw.so.0.0.0 cwlib.o -lm; \ ++ -o libcw.so.0.0.0 cwlib_sl.o -lm; \ + else \ + if [ "$(LD_LINKS_SO)" = "yes" ]; then \ + $(LD) $(LDFLAGS) -G -Wl,-soname,libcw.so.0 \ +- -o libcw.so.0.0.0 cwlib.o -lm; \ ++ -o libcw.so.0.0.0 cwlib_sl.o -lm; \ + fi \ + fi + +@@ -78,6 +79,9 @@ + # Define dependencies related to header/include files. + cwlib.o: Makefile cwlib.h + ++cwlib_sl.o: Makefile cwlib.h ++ $(CC) $(CFLAGS_SL) -c -o cwlib_sl.o cwlib.c ++ + cwlibtest.o: Makefile cwlib.h + + # Install targets. diff --git a/media-radio/unixcw/files/unixcw-2.3-parallel-make.patch b/media-radio/unixcw/files/unixcw-2.3-parallel-make.patch index 5660f6cbe..555c85406 100644 --- a/media-radio/unixcw/files/unixcw-2.3-parallel-make.patch +++ b/media-radio/unixcw/files/unixcw-2.3-parallel-make.patch @@ -26,3 +26,14 @@ distclean mostlyclean maintainer-clean: - $(DESCEND) + +$(DESCEND) +--- src/cwlib/Makefile.orig 2009-09-08 14:07:37.000000000 +0200 ++++ src/cwlib/Makefile 2009-09-08 14:10:05.000000000 +0200 +@@ -65,7 +65,7 @@ + rm -f signatures functions + + # Build the unit test. +-cwlibtest: cwlibtest.o ++cwlibtest: cwlibtest.o libcw.a libcw.so.0.0.0 + $(CC) -o cwlibtest cwlibtest.o -L. -lcw -lm + + # Build the pkgconfig metadata file. |