diff options
| author | Mark Pulford <markp@FreeBSD.org> | 2001-07-19 13:41:46 +0000 |
|---|---|---|
| committer | Mark Pulford <markp@FreeBSD.org> | 2001-07-19 13:41:46 +0000 |
| commit | 8ba0339c2ae9061d0cadffc8933f2dddb2b57e95 (patch) | |
| tree | 78f9dc0b6b5149cae80993e0bc2bf0e5579dd3d3 /audio/grip | |
| parent | Update to 4.4.1 (diff) | |
gtk12-config handles pthreads. Removed redundant -pthread.
Notes
Notes:
svn path=/head/; revision=45244
Diffstat (limited to 'audio/grip')
| -rw-r--r-- | audio/grip/Makefile | 2 | ||||
| -rw-r--r-- | audio/grip/files/patch-aa | 20 |
2 files changed, 10 insertions, 12 deletions
diff --git a/audio/grip/Makefile b/audio/grip/Makefile index 10b9a7ecca98..b5929081abbd 100644 --- a/audio/grip/Makefile +++ b/audio/grip/Makefile @@ -18,8 +18,6 @@ USE_GTK= yes ALL_TARGET= gripnopar gcd MAN1= grip.1 MLINKS= grip.1 gcd.1 -MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" post-patch: @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/*.c diff --git a/audio/grip/files/patch-aa b/audio/grip/files/patch-aa index e2c2c0077cb2..ada13a171613 100644 --- a/audio/grip/files/patch-aa +++ b/audio/grip/files/patch-aa @@ -1,6 +1,6 @@ --- Makefile.orig Thu Oct 19 04:42:53 2000 -+++ Makefile Thu Jul 19 16:32:12 2001 -@@ -4,29 +4,29 @@ ++++ Makefile Thu Jul 19 23:07:59 2001 +@@ -4,30 +4,24 @@ OS=$(shell uname -s) # Compiler @@ -21,18 +21,18 @@ # Compiler flags -CFLAGS= -Wall `gtk-config --cflags` -DAUXDIR=\"$(AUXDIR)\" \ -+CFLAGS+= $(PTHREAD_CFLAGS) `$(GTK_CONFIG) --cflags gthread` -DAUXDIR=\"$(AUXDIR)\" \ ++CFLAGS+= `$(GTK_CONFIG) --cflags gthread` -DAUXDIR=\"$(AUXDIR)\" \ -DINSTALLDIR=\"$(INSTALLDIR)\" -D_REENTRANT # Link libraries -LIBS= `gtk-config --libs gthread` -+LIBS= `$(GTK_CONFIG) --libs gthread` - ifeq ($(OS), Linux) - LIBS+= -lpthread - endif - ifeq ($(OS), FreeBSD) +-ifeq ($(OS), Linux) +-LIBS+= -lpthread +-endif +-ifeq ($(OS), FreeBSD) -LIBS+= -pthread -+LIBS+= $(PTHREAD_LIBS) - endif +-endif ++LIBS= `$(GTK_CONFIG) --libs gthread` PARLIBS= cdparanoia/interface/libcdda_interface.a \ cdparanoia/paranoia/libcdda_paranoia.a + |