From a6d889e933fe7d15dfb9f19457826fa75af754c9 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Tue, 19 Jun 2007 15:13:39 +0000 Subject: [PATCH] - remove wrong variable ; objc threading will be fixed one way or the other --- x11/gnustep/make/Makefile | 3 ++- x11/gnustep/make/patches/patch-target_make | 12 ++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/x11/gnustep/make/Makefile b/x11/gnustep/make/Makefile index 8e5ab12d4ff..933dbd4ba15 100644 --- a/x11/gnustep/make/Makefile +++ b/x11/gnustep/make/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2007/05/29 03:00:34 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.2 2007/06/19 15:13:39 ajacoutot Exp $ PKG_ARCH= * COMMENT= "GNUstep makefile package" DISTNAME= gnustep-make-2.0.1 +PKGNAME= ${DISTNAME}p0 CATEGORIES= devel HOMEPAGE= http://www.gnustep.org/ diff --git a/x11/gnustep/make/patches/patch-target_make b/x11/gnustep/make/patches/patch-target_make index a54f9f7a99b..a350838ebdc 100644 --- a/x11/gnustep/make/patches/patch-target_make +++ b/x11/gnustep/make/patches/patch-target_make @@ -1,6 +1,6 @@ -$OpenBSD: patch-target_make,v 1.1.1.1 2007/05/29 03:00:34 ajacoutot Exp $ +$OpenBSD: patch-target_make,v 1.2 2007/06/19 15:13:39 ajacoutot Exp $ --- target.make.orig Fri Mar 9 12:42:00 2007 -+++ target.make Wed May 23 15:47:43 2007 ++++ target.make Tue Jun 19 09:40:31 2007 @@ -748,18 +748,17 @@ SHARED_LIB_LINK_CMD = \ $(RM_LN_S) $(LIB_LINK_FILE); \ if [ "$(LIB_LINK_SONAME_FILE)" != "$(LIB_LINK_VERSION_FILE)" ]; then\ @@ -24,11 +24,3 @@ $OpenBSD: patch-target_make,v 1.1.1.1 2007/05/29 03:00:34 ajacoutot Exp $ OBJ_MERGE_CMD = \ $(CC) -nostdlib -r $(ALL_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ; -@@ -772,6 +771,7 @@ BUNDLE_LD = $(CC) - BUNDLE_LDFLAGS += -shared -fPIC - ADDITIONAL_LDFLAGS += -Wl,-E - STATIC_LDFLAGS += -static -+OBJC_LIBS += -pthread - - # nm on OpenBSD is rather like on Darwin - EXTRACT_CLASS_NAMES_COMMAND = nm -g $$object_file | sed -n -e '/[^U] __objc_class_name_/ {s/[0-9a-f]* [^U] __objc_class_name_//p;}'