[Midnightbsd-cvs] mports: devel/gnustep-make: add midnightbsd patches to gnustep-make.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Feb 9 02:26:21 EST 2009


Log Message:
-----------
add midnightbsd patches to gnustep-make.  (much more needs to be done)

Modified Files:
--------------
    mports/devel/gnustep-make:
        Makefile (r1.10 -> r1.11)

Added Files:
-----------
    mports/devel/gnustep-make/files:
        patch-clean_os.sh (r1.1)
        patch-config.guess (r1.1)
        patch-config.sub (r1.1)
        patch-configure (r1.1)
        patch-configure.ac (r1.1)
        patch-target.make (r1.1)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/gnustep-make/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -L devel/gnustep-make/Makefile -L devel/gnustep-make/Makefile -u -r1.10 -r1.11
--- devel/gnustep-make/Makefile
+++ devel/gnustep-make/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnustep-make
 PORTVERSION=	2.0.6
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	core
--- /dev/null
+++ devel/gnustep-make/files/patch-target.make
@@ -0,0 +1,66 @@
+--- target.make.orig	2009-02-09 02:04:28 -0500
++++ target.make	2009-02-09 02:06:35 -0500
+@@ -669,6 +669,63 @@
+ 
+ ####################################################
+ #
++# MidnightBSD ELF
++#
++ifeq ($(findstring midnightbsd, $(GNUSTEP_TARGET_OS)), midnightbsd)
++HAVE_SHARED_LIBS        = yes
++SHARED_LIB_LINK_CMD = \
++        $(CC) -shared -Wl,-soname,$(LIB_LINK_SONAME_FILE) \
++           $(ALL_LDFLAGS) -o $(LIB_LINK_OBJ_DIR)/$(LIB_LINK_VERSION_FILE) $^ \
++           $(INTERNAL_LIBRARIES_DEPEND_UPON) \
++           $(SHARED_LD_POSTFLAGS) \
++        && (cd $(LIB_LINK_OBJ_DIR); \
++          $(RM_LN_S) $(LIB_LINK_FILE); \
++          if [ "$(LIB_LINK_SONAME_FILE)" != "$(LIB_LINK_VERSION_FILE)" ]; then\
++            $(RM_LN_S) $(LIB_LINK_SONAME_FILE);\
++            $(LN_S) $(LIB_LINK_VERSION_FILE) $(LIB_LINK_SONAME_FILE); \
++          fi; \
++          $(LN_S) $(LIB_LINK_SONAME_FILE) $(LIB_LINK_FILE))
++AFTER_INSTALL_SHARED_LIB_CMD = \
++        (cd $(LIB_LINK_INSTALL_DIR); \
++          $(RM_LN_S) $(LIB_LINK_FILE); \
++          if [ "$(LIB_LINK_SONAME_FILE)" != "$(LIB_LINK_VERSION_FILE)" ]; then\
++            $(RM_LN_S) $(LIB_LINK_SONAME_FILE);\
++            $(LN_S) $(LIB_LINK_VERSION_FILE) $(LIB_LINK_SONAME_FILE); \
++          fi; \
++          $(LN_S) $(LIB_LINK_SONAME_FILE) $(LIB_LINK_FILE); \
++        )
++AFTER_INSTALL_SHARED_LIB_CHOWN = \
++        (cd $(LIB_LINK_INSTALL_DIR); \
++        chown $(CHOWN_TO) $(LIB_LINK_SONAME_FILE); \
++        chown $(CHOWN_TO) $(LIB_LINK_FILE))
++OBJ_MERGE_CMD           = \
++        $(CC) -nostdlib -r $(ALL_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
++
++SHARED_CFLAGS   += -fPIC
++SHARED_LIBEXT   = .so
++
++HAVE_BUNDLES    = yes
++BUNDLE_LD       = $(CC)
++BUNDLE_LDFLAGS  += -shared
++ADDITIONAL_LDFLAGS += -rdynamic
++STATIC_LDFLAGS += -static
++
++##
++## The -pthread flag must be passed to all compilation/link commands.
++##
++ifeq ($(objc_threaded), -pthread)
++  INTERNAL_CFLAGS += -pthread
++  INTERNAL_OBJCFLAGS += -pthread
++  INTERNAL_LDFLAGS += -pthread
++endif
++endif
++#
++# end MidnightBSD
++#
++####################################################
++
++####################################################
++#
+ # NetBSD (ELF)
+ #
+ ifeq ($(findstring netbsd, $(GNUSTEP_TARGET_OS)), netbsd)
--- /dev/null
+++ devel/gnustep-make/files/patch-configure.ac
@@ -0,0 +1,32 @@
+--- configure.ac.orig	2009-02-09 02:03:06 -0500
++++ configure.ac	2009-02-09 02:03:51 -0500
+@@ -110,7 +110,7 @@
+ # specific target_os options
+ #--------------------------------------------------------------------
+ case "$target_os" in
+-  freebsd* | openbsd* )	
++  freebsd* | midnightbsd* | openbsd* )	
+ 	        INCLUDES="$INCLUDES -I/usr/local/include"
+ 		LIB_DIR="$LIB_DIR -L/usr/local/lib";;
+   netbsd*)	INCLUDES="$INCLUDES -I/usr/pkg/include"
+@@ -1115,6 +1115,20 @@
+     AC_TRY_RUN([#include "config_thread.m"], objc_threaded="-lpcthread",
+ 	objc_threaded="", objc_threaded="-lpcthread")
+   fi
++elif test "`echo $host_os|sed 's/[[0-9]].*//'|sed s/elf//`" = midnightbsd; then
++  LIBS="-pthread -lobjc"
++  AC_TRY_RUN([#include "config_thread.m"], objc_threaded="-pthread",
++       objc_threaded="", objc_threaded="-pthread")
++  if test x"$objc_threaded" = x""; then
++    LIBS="-lpthread -lobjc"
++    AC_TRY_RUN([#include "config_thread.m"], objc_threaded="-lpthread",
++        objc_threaded="", objc_threaded="-lpthread")
++  fi
++  if test x"$objc_threaded" = x""; then
++    LIBS="-lobjc -lpcthread"
++    AC_TRY_RUN([#include "config_thread.m"], objc_threaded="-lpcthread",
++        objc_threaded="", objc_threaded="-lpcthread")
++  fi
+ elif test "$MINGW32" = yes; then
+   # Mingw doesn't need anything extra for threads
+   LIBS="-lobjc $LIBS"
--- /dev/null
+++ devel/gnustep-make/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2008-05-25 07:16:03 -0400
++++ configure	2009-02-09 02:18:49 -0500
+@@ -3699,7 +3699,7 @@
+ # specific target_os options
+ #--------------------------------------------------------------------
+ case "$target_os" in
+-  freebsd* | openbsd* )
++  freebsd* | midnightbsd* | openbsd* )
+ 	        INCLUDES="$INCLUDES -I/usr/local/include"
+ 		LIB_DIR="$LIB_DIR -L/usr/local/lib";;
+   netbsd*)	INCLUDES="$INCLUDES -I/usr/pkg/include"
--- /dev/null
+++ devel/gnustep-make/files/patch-config.sub
@@ -0,0 +1,13 @@
+--- config.sub.orig	2009-02-09 01:58:33 -0500
++++ config.sub	2009-02-09 01:59:52 -0500
+@@ -1250,8 +1250,8 @@
+ 	      | -aos* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+-	      | -openbsd* | -solidbsd* \
++	      | -hiux* | -386bsd* | -knetbsd* | -midnightbsd* | -mirbsd* \
++	      | -netbsd* | -openbsd* | -solidbsd* \
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
--- /dev/null
+++ devel/gnustep-make/files/patch-config.guess
@@ -0,0 +1,18 @@
+--- config.guess.orig	2009-02-09 01:55:38 -0500
++++ config.guess	2009-02-09 01:56:56 -0500
+@@ -1324,6 +1324,15 @@
+     i*86:rdos:*:*)
+ 	echo ${UNAME_MACHINE}-pc-rdos
+ 	exit ;;
++    *:MidnightBSD:*:*)
++        case ${UNAME_MACHINE} in
++            amd64)
++                echo x86_64-unknown-midnightbsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++            *)
++                echo ${UNAME_MACHINE}-unknown-midnightbsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++        esac
++        exit ;;
++
+ esac
+ 
+ #echo '(No uname command or uname output not recognized.)' 1>&2
--- /dev/null
+++ devel/gnustep-make/files/patch-clean_os.sh
@@ -0,0 +1,14 @@
+--- clean_os.sh.orig	2009-02-09 01:54:41 -0500
++++ clean_os.sh	2009-02-09 01:55:17 -0500
+@@ -31,6 +31,11 @@
+ 	echo freebsd
+ 	exit 0
+ 	;;
++    # Remove version number for MidnightBSD
++    midnightbsd*)
++        echo midnightbsd
++        exit 0
++        ;;
+     # Remove version number for Darwin
+     # Versions currently most common have a quick hardcoded lookup
+     darwin9*)


More information about the Midnightbsd-cvs mailing list