cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do the same thing for frameworks, as we do for libraries to set the .so.MAJOR.MINOR correctly, use the INSTANCE_VERSION variable instead of VERSION

Browse Source 
OK landry@
This commit is contained in:
sebastia 2010-11-24 07:10:44 +00:00
parent a03e1b004a
commit 68afba5cdf
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gnustep/make/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.24 2010/11/22 08:36:59 espie Exp $ # $OpenBSD: Makefile,v 1.25 2010/11/24 07:10:44 sebastia Exp $
# WARNING: this port does NOT use the x11/gnustep MODULE # WARNING: this port does NOT use the x11/gnustep MODULE
@ -7,7 +7,7 @@ PKG_ARCH= *
COMMENT= GNUstep makefile package COMMENT= GNUstep makefile package
DISTNAME= gnustep-make-2.4.0 DISTNAME= gnustep-make-2.4.0
REVISION= 3 REVISION= 4
CATEGORIES= devel x11/gnustep CATEGORIES= devel x11/gnustep
HOMEPAGE= http://www.gnustep.org/ HOMEPAGE= http://www.gnustep.org/

13
x11/gnustep/make/patches/patch-Instance_framework_make
View File

@ -1,6 +1,15 @@
$OpenBSD: patch-Instance_framework_make,v 1.6 2010/06/07 06:28:13 ajacoutot Exp $ $OpenBSD: patch-Instance_framework_make,v 1.7 2010/11/24 07:10:44 sebastia Exp $
--- Instance/framework.make.orig Mon Feb 15 00:13:47 2010 --- Instance/framework.make.orig Mon Feb 15 00:13:47 2010
+++ Instance/framework.make Mon Jun 7 08:15:35 2010 +++ Instance/framework.make Thu Nov 18 11:11:02 2010
@@ -252,7 +252,7 @@ FRAMEWORK_CURRENT_LIBRARY_DIR = $(GNUSTEP_BUILD_DIR)/$
ifneq ($(BUILD_DLL), yes)
FRAMEWORK_LIBRARY_FILE = lib$(GNUSTEP_INSTANCE)$(SHARED_LIBEXT)
-VERSION_FRAMEWORK_LIBRARY_FILE = $(FRAMEWORK_LIBRARY_FILE).$(VERSION)
+VERSION_FRAMEWORK_LIBRARY_FILE = $(FRAMEWORK_LIBRARY_FILE).$(INTERFACE_VERSION)
SONAME_FRAMEWORK_FILE = $(FRAMEWORK_LIBRARY_FILE).$(INTERFACE_VERSION)
else # BUILD_DLL
@@ -557,13 +557,7 @@ $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(G @@ -557,13 +557,7 @@ $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(G
$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/ $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/
ifeq ($(MAKE_CURRENT_VERSION),yes) ifeq ($(MAKE_CURRENT_VERSION),yes)