diff options
author | Michael Nottebrock <lofi@FreeBSD.org> | 2004-06-01 15:33:15 +0000 |
---|---|---|
committer | Michael Nottebrock <lofi@FreeBSD.org> | 2004-06-01 15:33:15 +0000 |
commit | 6a30df2fc03a166601c98d61b115bea7a3f2ddb9 (patch) | |
tree | 395e578d332980400cba2fb97455ddc7c2252f98 /audio | |
parent | - Update to 0.71b (diff) |
Make PTHREAD_LIBS-safe.
Notes
Notes:
svn path=/head/; revision=110614
Diffstat (limited to 'audio')
-rw-r--r-- | audio/arts/Makefile | 2 | ||||
-rw-r--r-- | audio/arts/files/patch-flow_gsl_Makefile.in | 11 | ||||
-rw-r--r-- | audio/arts/files/patch-mcopidl_Makefile.in | 11 | ||||
-rw-r--r-- | audio/arts/files/patch-soundserver-Makefile.in | 28 |
4 files changed, 52 insertions, 0 deletions
diff --git a/audio/arts/Makefile b/audio/arts/Makefile index ecc9137c7305..8cfc10549cdf 100644 --- a/audio/arts/Makefile +++ b/audio/arts/Makefile @@ -53,6 +53,8 @@ LIB_DEPENDS+= audio:${PORTSDIR}/audio/nas .endif pre-configure: + @${REINPLACE_CMD} -e 's|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \ + ${WRKSRC}/${CONFIGURE_SCRIPT} .if defined(WITHOUT_ESD) ${REINPLACE_CMD} -e 's|arts_libesd_include=yes|arts_libesd_include=no|g' \ ${WRKSRC}/configure diff --git a/audio/arts/files/patch-flow_gsl_Makefile.in b/audio/arts/files/patch-flow_gsl_Makefile.in new file mode 100644 index 000000000000..1a44e9f23569 --- /dev/null +++ b/audio/arts/files/patch-flow_gsl_Makefile.in @@ -0,0 +1,11 @@ +--- flow/gsl/Makefile.in.orig Sun May 30 18:24:53 2004 ++++ flow/gsl/Makefile.in Tue Jun 1 16:21:56 2004 +@@ -485,7 +485,7 @@ + #>- libgsl_la_LDFLAGS = -no-undefined $(all_libraries) + #>+ 1 + libgsl_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries) +-GSL_progs_ldadd = libgsl.la -lm $(USE_THREADS) ++GSL_progs_ldadd = libgsl.la -lm $(USE_THREADS) $(LIBPTHREAD) + GSL_cc_dummy = dummy.cc + #>- all: all-am + #>+ 1 diff --git a/audio/arts/files/patch-mcopidl_Makefile.in b/audio/arts/files/patch-mcopidl_Makefile.in new file mode 100644 index 000000000000..583880f023ea --- /dev/null +++ b/audio/arts/files/patch-mcopidl_Makefile.in @@ -0,0 +1,11 @@ +--- mcopidl/Makefile.in.orig Tue Jun 1 15:51:13 2004 ++++ mcopidl/Makefile.in Tue Jun 1 15:51:56 2004 +@@ -348,7 +348,7 @@ + INCLUDES = -I$(top_srcdir)/mcop $(all_includes) + mcopidl_SOURCES = mcopidl.cc yacc.cc scanner.cc namespace.cc + mcopidl_LDFLAGS = $(all_libraries) +-mcopidl_LDADD = ../mcop/libmcop.la ++mcopidl_LDADD = ../mcop/libmcop.la $(LIBPTHREAD) + noinst_HEADERS = yacc.cc.h + #>- all: all-am + #>+ 1 diff --git a/audio/arts/files/patch-soundserver-Makefile.in b/audio/arts/files/patch-soundserver-Makefile.in index 8d37c4fa644f..1cce355e4457 100644 --- a/audio/arts/files/patch-soundserver-Makefile.in +++ b/audio/arts/files/patch-soundserver-Makefile.in @@ -64,3 +64,31 @@ mostlyclean-compile: -rm -f *.$(OBJEXT) +--- soundserver/Makefile.in.orig Tue Jun 1 16:36:34 2004 ++++ soundserver/Makefile.in Tue Jun 1 16:45:08 2004 +@@ -545,20 +545,20 @@ + libartsgslplayobject_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -module $(all_libraries) + libartsgslplayobject_la_COMPILE_FIRST = soundserver.h ../flow/artsflow.h + artsd_LDADD = libsoundserver_idl.la $(FLOWLIBS) \ +- $(top_builddir)/mcop_mt/libmcop_mt.la $(USE_THREADS) ++ $(top_builddir)/mcop_mt/libmcop_mt.la $(USE_THREADS) $(LIBPTHREAD) + + artsd_SOURCES = soundserverv2_impl.cc soundserver_impl.cc simplesoundserver_impl.cc artsd.cc cpuusage.cc samplestorage_impl.cc crashhandler.cc soundserverstartup_impl.cc + artsd_COMPILE_FIRST = soundserver.h artsversion.h +-artscat_LDADD = libsoundserver_idl.la $(FLOWLIBS) $(USE_THREADS) ++artscat_LDADD = libsoundserver_idl.la $(FLOWLIBS) $(USE_THREADS) $(LIBPTHREAD) + artscat_SOURCES = artscat.cc + artscat_COMPILE_FIRST = soundserver.h artsversion.h +-artsrec_LDADD = libsoundserver_idl.la $(FLOWLIBS) $(USE_THREADS) ++artsrec_LDADD = libsoundserver_idl.la $(FLOWLIBS) $(USE_THREADS) $(LIBPTHREAD) + artsrec_SOURCES = artsrec.cc + artsrec_COMPILE_FIRST = soundserver.h artsversion.h +-artsplay_LDADD = libsoundserver_idl.la $(USE_THREADS) ++artsplay_LDADD = libsoundserver_idl.la $(USE_THREADS) $(LIBPTHREAD) + artsplay_SOURCES = artsplay.cc + artsplay_COMPILE_FIRST = soundserver.h artsversion.h +-artsshell_LDADD = libsoundserver_idl.la $(USE_THREADS) ++artsshell_LDADD = libsoundserver_idl.la $(USE_THREADS) $(LIBPTHREAD) + artsshell_SOURCES = artsshell.cc tradercheck.cc + artsshell_COMPILE_FIRST = soundserver.h artsversion.h + DISTCLEANFILES = soundserver.cc soundserver.h soundserver.mcopclass \ |