SF.net SVN: gar:[25732] csw/mgar/pkg/wxwidgets/trunk/Makefile

lblume at users.sourceforge.net lblume at users.sourceforge.net
Sat May 28 09:41:49 CEST 2016 

Revision: 25732
          http://sourceforge.net/p/gar/code/25732
Author:   lblume
Date:     2016-05-28 07:41:49 +0000 (Sat, 28 May 2016)
Log Message:
-----------
wxwidgets/trunk: I think the package name has to be versioned

Modified Paths:
--------------
    csw/mgar/pkg/wxwidgets/trunk/Makefile

Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/Makefile	2016-05-27 22:43:19 UTC (rev 25731)
+++ csw/mgar/pkg/wxwidgets/trunk/Makefile	2016-05-28 07:41:49 UTC (rev 25732)
@@ -22,39 +22,40 @@
 
 GARCOMPILER=GCC5
 
-PACKAGES  = CSWwxwidgets
+# The name needs to contain the version, as it is not split by soname
+PACKAGES  = CSWwxwidgets31
 PACKAGES += CSWwxwidgets-dev
-PACKAGES += CSWwxwidgetsgtk2
+PACKAGES += CSWwxwidgets31gtk2
 
-SPKG_DESC_CSWwxwidgets     = A cross-platform toolkit
-SPKG_DESC_CSWwxwidgets-dev = A cross-platform toolkit, header files
-SPKG_DESC_CSWwxwidgetsgtk2 = A cross-platform toolkit, gtk2 support
+SPKG_DESC_CSWwxwidgets31     = A cross-platform toolkit
+SPKG_DESC_CSWwxwidgets-dev   = A cross-platform toolkit, header files
+SPKG_DESC_CSWwxwidgets31gtk2 = A cross-platform toolkit, gtk2 support
 
-RUNTIME_DEP_PKGS_CSWwxwidgets += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWwxwidgets += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWwxwidgets += CSWlibz1
-RUNTIME_DEP_PKGS_CSWwxwidgets += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWwxwidgets += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWwxwidgets31 += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWwxwidgets31 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWwxwidgets31 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWwxwidgets31 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWwxwidgets31 += CSWlibstdc++6
 
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWwxwidgets
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgdk-x11-2-0-0
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgdk-pixbuf2-0-0
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgtk-x11-2-0-0
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibtiff5
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWmesa
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgnomeprintui
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibpango1-0-0
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibpng16-16
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibpangocairo1-0-0
+RUNTIME_DEP_PKGS_CSWwxwidgets31gtk2 += CSWwxwidgets
+RUNTIME_DEP_PKGS_CSWwxwidgets31gtk2 += CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWwxwidgets31gtk2 += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWwxwidgets31gtk2 += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWwxwidgets31gtk2 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWwxwidgets31gtk2 += CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWwxwidgets31gtk2 += CSWlibtiff5
+RUNTIME_DEP_PKGS_CSWwxwidgets31gtk2 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWwxwidgets31gtk2 += CSWmesa
+RUNTIME_DEP_PKGS_CSWwxwidgets31gtk2 += CSWlibgnomeprintui
+RUNTIME_DEP_PKGS_CSWwxwidgets31gtk2 += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWwxwidgets31gtk2 += CSWlibpng16-16
+RUNTIME_DEP_PKGS_CSWwxwidgets31gtk2 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWwxwidgets31gtk2 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWwxwidgets31gtk2 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWwxwidgets31gtk2 += CSWlibpangocairo1-0-0
 
 RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWwxwidgets
-RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWwxwidgetsgtk2
+RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWwxwidgets31gtk2
 RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWintltool
 RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWpkgconfig
 RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWlibgtk2-dev
@@ -72,9 +73,9 @@
 ##
 # Needed for the Solaris ld bug
 ifeq ($(shell /usr/bin/uname -p),sparc)
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWwxwidgets31gtk2 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWwxwidgets31gtk2 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWwxwidgets31gtk2 += CSWlibz1
 endif
 ###
 
@@ -94,19 +95,19 @@
 BUILD_DEP_PKGS += CSWgstreamer-dev
 
 # Easier than defining each individual .so.xxx
-PKGFILES_CSWwxwidgets     = $(call baseisadirs,$(libdir),libwx_baseu.*\.so\..*)
-PKGFILES_CSWwxwidgets    += $(sharedir)/locale.*
+PKGFILES_CSWwxwidgets31  = $(call baseisadirs,$(libdir),libwx_baseu.*\.so\..*)
+PKGFILES_CSWwxwidgets31 += $(sharedir)/locale.*
 
-PKGFILES_CSWwxwidgetsgtk2 = $(call baseisadirs,$(libdir),libwx_gtk2.*\.so\..*)
+PKGFILES_CSWwxwidgets31gtk2 = $(call baseisadirs,$(libdir),libwx_gtk2.*\.so\..*)
 
 # PKGFILES is catchall
 # PKGFILES_CSWwxwidgets-dev
 
-CATALOGNAME_CSWwxwidgets       = wxwidgets
+CATALOGNAME_CSWwxwidgets31     = wxwidgets31
 CATALOGNAME_CSWwxwidgets-dev   = wxwidgets_dev
-CATALOGNAME_CSWwxwidgetsgtk2   = wxwidgetsgtk2
+CATALOGNAME_CSWwxwidgets31gtk2 = wxwidgets31gtk2
 
-OBSOLETED_BY_CSWwxwidgets     = CSWwxwidgetscommon
+OBSOLETED_BY_CSWwxwidgets31   = CSWwxwidgetscommon
 OBSOLETED_BY_CSWwxwidgets-dev = CSWwxwidgetsdevel
 
 TEST_SCRIPTS =
@@ -121,20 +122,13 @@
 CONFIGURE_ARGS += --enable-printarch=yes
 CONFIGURE_ARGS += --with-gnomeprint=yes
 
-# -norunpath is needed for LDFLAGS as CC is used as linker. Not cc, so no
-# problem with it being a C++compiler parameter
-#EXTRA_CFLAGS     += -xnorunpath
-#EXTRA_CXXFLAGS   += -norunpath
-#EXTRA_LDFLAGS    += -norunpath
-#EXTRA_LD_OPTIONS += -z nolazyload -z ignore -Bdirect -lCrun -lCstd
-
 # wxWidget contains a bunch of .so, let's keep them together as one big
 # happy family
-CHECKPKG_OVERRIDES_CSWwxwidgets     = shared-lib-pkgname-mismatch
-CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 = shared-lib-pkgname-mismatch
+CHECKPKG_OVERRIDES_CSWwxwidgets31     = shared-lib-pkgname-mismatch
+CHECKPKG_OVERRIDES_CSWwxwidgets31gtk2 = shared-lib-pkgname-mismatch
 
 # It is built to use GNOME print, so it must be depending on this somehow
-CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += surplus-dependency|CSWlibgnomeprintui
+CHECKPKG_OVERRIDES_CSWwxwidgets31gtk2 += surplus-dependency|CSWlibgnomeprintui
 
 # Only samples inside code comments, can be safely ignored at this point
 CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-with-bad-content|/usr/share|root/opt/csw/include/wx-3.1/wx/utils.h
@@ -145,12 +139,12 @@
 CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-needed-but-no-package-satisfies-it|/opt/csw/lib/64/wx/config/gtk2-unicode-3.1|CSWwxwidgets-dev|contains|symlink|/opt/csw/bin/sparcv9/wx-config|which|needs|the|target|file:|/opt/csw/lib/64/wx/config/gtk2-unicode-3.1 
 
 # No idea why it complains there...
-CHECKPKG_OVERRIDES_CSWwxwidgets += file-with-bad-content|/usr/local|root/opt/csw/lib/libwx_baseu-3.1.so.0
-CHECKPKG_OVERRIDES_CSWwxwidgets += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libwx_baseu-3.1.so.0
-CHECKPKG_OVERRIDES_CSWwxwidgets += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libwx_baseu-3.1.so.0
-CHECKPKG_OVERRIDES_CSWwxwidgets += file-with-bad-content|/usr/share|root/opt/csw/lib/libwx_baseu-3.1.so.0
-CHECKPKG_OVERRIDES_CSWwxwidgets += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libwx_baseu-3.1.so.0
-CHECKPKG_OVERRIDES_CSWwxwidgets += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libwx_baseu-3.1.so.0
+CHECKPKG_OVERRIDES_CSWwxwidgets31 += file-with-bad-content|/usr/local|root/opt/csw/lib/libwx_baseu-3.1.so.0
+CHECKPKG_OVERRIDES_CSWwxwidgets31 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libwx_baseu-3.1.so.0
+CHECKPKG_OVERRIDES_CSWwxwidgets31 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libwx_baseu-3.1.so.0
+CHECKPKG_OVERRIDES_CSWwxwidgets31 += file-with-bad-content|/usr/share|root/opt/csw/lib/libwx_baseu-3.1.so.0
+CHECKPKG_OVERRIDES_CSWwxwidgets31 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libwx_baseu-3.1.so.0
+CHECKPKG_OVERRIDES_CSWwxwidgets31 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libwx_baseu-3.1.so.0
 
 LICENSE = docs/licence.txt
 INSTALL_SCRIPTS = wxwidgets

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the devel mailing list