Revision: 26209
http://sourceforge.net/p/gar/code/26209
Author: rmottola
Date: 2017-05-11 23:29:20 +0000 (Thu, 11 May 2017)
Log Message:
-----------
gs_ftp/trunk: minor cleanup
Modified Paths:
--------------
csw/mgar/pkg/gs_ftp/trunk/Makefile
Modified: csw/mgar/pkg/gs_ftp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gs_ftp/trunk/Makefile 2017-05-11 17:06:12 UTC (rev 26208)
+++ csw/mgar/pkg/gs_ftp/trunk/Makefile 2017-05-11 23:29:20 UTC (rev 26209)
@@ -16,7 +16,6 @@
DISTFILES = $(DISTNAME).tar.gz
BUILD_DEP_PKGS += CSWgmake
-BUILD_DEP_PKGS += CSWgcc4objc
RUNTIME_DEP_PKGS_CSWgs-ftp += CSWgnustep-make
RUNTIME_DEP_PKGS_CSWgs-ftp += CSWgnustep-base
@@ -23,7 +22,9 @@
RUNTIME_DEP_PKGS_CSWgs-ftp += CSWgnustep-gui
RUNTIME_DEP_PKGS_CSWgs-ftp += CSWgnustep-back
RUNTIME_DEP_PKGS_CSWgs-ftp += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWgs-ftp += CSWlibobjc4
+RUNTIME_DEP_PKGS_CSWgs-ftp_5.9 += CSWlibobjc3
+RUNTIME_DEP_PKGS_CSWgs-ftp_5.10 += CSWlibobjc4
+RUNTIME_DEP_PKGS_CSWgs-ftp += $(RUNTIME_DEP_PKGS_CSWgs-ftp_$(GAROSREL))
#we know about these, but they are needed at runtime
CHECKPKG_OVERRIDES_CSWgs-ftp += surplus-dependency|CSWgnustep-gui
@@ -32,30 +33,18 @@
CHECKPKG_OVERRIDES_CSWgs-ftp += surplus-dependency|CSWgnustep-make
#these are due to our bundles
-CHECKPKG_OVERRIDES_CSWgs-ftp +=
binary-architecture-does-not-match-placement|file=opt/csw/GNUstep/Local/Applications/FTP.app/FTP|arch_id=18|arch_name=sparcv8+
-CHECKPKG_OVERRIDES_CSWgs-ftp +=
binary-architecture-does-not-match-placement|file=opt/csw/GNUstep/Local/Applications/FTP.app/FTP|arch_id=3|arch_name=i386
+CHECKPKG_OVERRIDES_CSWgs-ftp += binary-architecture-does-not-match-placement
+CHECKPKG_OVERRIDES_CSWgs-ftp += no-direct-binding
-CHECKPKG_OVERRIDES_CSWgs-ftp +=
no-direct-binding|/opt/csw/GNUstep/Local/Applications/FTP.app/FTP|is|not|directly|bound|to|soname|libgcc_s.so.1
-CHECKPKG_OVERRIDES_CSWgs-ftp +=
no-direct-binding|/opt/csw/GNUstep/Local/Applications/FTP.app/FTP|is|not|directly|bound|to|soname|libgnustep-base.so.1.24
-CHECKPKG_OVERRIDES_CSWgs-ftp +=
no-direct-binding|/opt/csw/GNUstep/Local/Applications/FTP.app/FTP|is|not|directly|bound|to|soname|libgnustep-gui.so.0.24
-CHECKPKG_OVERRIDES_CSWgs-ftp +=
no-direct-binding|/opt/csw/GNUstep/Local/Applications/FTP.app/FTP|is|not|directly|bound|to|soname|libobjc.so.4
-CHECKPKG_OVERRIDES_CSWgs-ftp +=
soname-not-found|libgnustep-gui.so.0.24|is|needed|by|opt/csw/GNUstep/Local/Applications/FTP.app/FTP
-CHECKPKG_OVERRIDES_CSWgs-ftp +=
soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/Local/Applications/FTP.app/FTP
-
#we do not directly bind
-CHECKPKG_OVERRIDES_CSWgs-ftp +=
no-direct-binding|/opt/csw/GNUstep/Local/Applications/FTP.app/FTP|is|not|directly|bound|to|soname|libgcc_s.so.1
-CHECKPKG_OVERRIDES_CSWgs-ftp +=
no-direct-binding|/opt/csw/GNUstep/Local/Applications/FTP.app/FTP|is|not|directly|bound|to|soname|libgnustep-base.so.1.24
-CHECKPKG_OVERRIDES_CSWgs-ftp +=
no-direct-binding|/opt/csw/GNUstep/Local/Applications/FTP.app/FTP|is|not|directly|bound|to|soname|libgnustep-gui.so.0.24
-CHECKPKG_OVERRIDES_CSWgs-ftp +=
no-direct-binding|/opt/csw/GNUstep/Local/Applications/FTP.app/FTP|is|not|directly|bound|to|soname|libobjc.so.4
-CHECKPKG_OVERRIDES_CSWgs-ftp +=
soname-not-found|libgnustep-gui.so.0.24|is|needed|by|opt/csw/GNUstep/Local/Applications/FTP.app/FTP
-CHECKPKG_OVERRIDES_CSWgs-ftp +=
soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/Local/Applications/FTP.app/FTP
+CHECKPKG_OVERRIDES_CSWgs-ftp += no-direct-binding
#where can we build?
-#PACKAGING_PLATFORMS += solaris9-sparc
-PACKAGING_PLATFORMS += solaris10-sparc
-PACKAGING_PLATFORMS += solaris10-i386
+PACKAGING_PLATFORMS += solaris9-i386 solaris9-sparc
+PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc
+
#we absolutely need GCC for Objective-C support. The only alternative in the
future would be clang
GARCOMPILER = GNU
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
