SF.net SVN: gar:[25930] csw/mgar/pkg/gettext/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Wed Sep 7 17:13:45 CEST 2016
Revision: 25930
http://sourceforge.net/p/gar/code/25930
Author: dmichelsen
Date: 2016-09-07 15:13:45 +0000 (Wed, 07 Sep 2016)
Log Message:
-----------
gettext/trunk: Update to 0.19.8
Modified Paths:
--------------
csw/mgar/pkg/gettext/trunk/Makefile
csw/mgar/pkg/gettext/trunk/checksums
Property Changed:
----------------
csw/mgar/pkg/gettext/trunk/
Index: csw/mgar/pkg/gettext/trunk
===================================================================
--- csw/mgar/pkg/gettext/trunk 2016-09-07 07:54:13 UTC (rev 25929)
+++ csw/mgar/pkg/gettext/trunk 2016-09-07 15:13:45 UTC (rev 25930)
Property changes on: csw/mgar/pkg/gettext/trunk
___________________________________________________________________
Modified: svn:ignore
## -1,4 +1 ##
-cookies
-download
work
-
Modified: csw/mgar/pkg/gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gettext/trunk/Makefile 2016-09-07 07:54:13 UTC (rev 25929)
+++ csw/mgar/pkg/gettext/trunk/Makefile 2016-09-07 15:13:45 UTC (rev 25930)
@@ -1,5 +1,5 @@
NAME = gettext
-VERSION = 0.19.1
+VERSION = 0.19.8
GARTYPE = v2
PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
@@ -10,7 +10,7 @@
endef
MASTER_SITES += $(GNU_MIRROR)
-DISTFILES += $(NAME)-$(VERSION).tar.gz
+DISTFILES += $(DISTNAME).tar.lz
# A few legacy packages that we still need to depend on for dependency reasons
# that we no longer want to rebuild and carry.
@@ -30,15 +30,16 @@
PACKAGES += CSWggettext
SPKG_DESC_CSWggettext = GNU locale utilities
-RUNTIME_DEP_PKGS_CSWggettext += CSWlibexpat1
+# PKGFILES is catchall
RUNTIME_DEP_PKGS_CSWggettext += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-18-3
-RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextsrc0-18-3
-RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-19-8
+RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextsrc0-19-8
+RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl9
RUNTIME_DEP_PKGS_CSWggettext += CSWlibgomp1
RUNTIME_DEP_PKGS_CSWggettext += CSWlibasprintf0
-RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextpo0
-RUNTIME_DEP_PKGS_CSWggettext += CSWlibunistring0
+RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextpo1
+RUNTIME_DEP_PKGS_CSWggettext += CSWlibunistring2
+RUNTIME_DEP_PKGS_CSWggettext += CSWlibxml2-2
RUNTIME_DEP_PKGS_CSWggettext += CSWggettext-data
CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWggettext-data
CHECKPKG_OVERRIDES_CSWggettext += missing-dependency|CSWemacs-common
@@ -51,6 +52,9 @@
CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibintl2
RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl3
CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibintl3
+# This is for the comment:
+# Ignore absolute directory pathnames, like /usr/local/share/aclocal.
+CHECKPKG_OVERRIDES_CSWggettext += file-with-bad-content|/usr/local|root/opt/csw/bin/ggettextize
PACKAGES += CSWlibasprintf0
SPKG_DESC_CSWlibasprintf0 += GNU locale utilities, libasprintf.so.0
@@ -61,59 +65,60 @@
CHECKPKG_OVERRIDES_CSWlibasprintf0 += surplus-dependency|CSWggettext-data
OBSOLETED_BY_CSWlibasprintf0 += CSWggettextrt
-PACKAGES += CSWlibgettextlib0-18-3
-SPKG_DESC_CSWlibgettextlib0-18-3 += GNU locale utilities, libgettextlib-0.18.3.so
-PKGFILES_CSWlibgettextlib0-18-3 += $(call pkgfiles_lib,libgettextlib-0.18.3.so)
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-3 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-3 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-3 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-3 += CSWlibncurses5
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-3 += CSWlibunistring0
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-3 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-3 += CSWggettext-data
-CHECKPKG_OVERRIDES_CSWlibgettextlib0-18-3 += surplus-dependency|CSWggettext-data
-CHECKPKG_OVERRIDES_CSWlibgettextlib0-18-3 += soname-equals-filename
+PACKAGES += CSWlibgettextlib0-19-8
+SPKG_DESC_CSWlibgettextlib0-19-8 += GNU locale utilities, libgettextlib-0.19.8.so
+PKGFILES_CSWlibgettextlib0-19-8 += $(call pkgfiles_lib,libgettextlib-0.19.8.so)
+RUNTIME_DEP_PKGS_CSWlibgettextlib0-19-8 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibgettextlib0-19-8 += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWlibgettextlib0-19-8 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibgettextlib0-19-8 += CSWlibncurses6
+RUNTIME_DEP_PKGS_CSWlibgettextlib0-19-8 += CSWlibunistring2
+RUNTIME_DEP_PKGS_CSWlibgettextlib0-19-8 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgettextlib0-19-8 += CSWggettext-data
+CHECKPKG_OVERRIDES_CSWlibgettextlib0-19-8 += surplus-dependency|CSWggettext-data
+CHECKPKG_OVERRIDES_CSWlibgettextlib0-19-8 += soname-equals-filename
-PACKAGES += CSWlibgettextpo0
-SPKG_DESC_CSWlibgettextpo0 += GNU locale utilities, libgettextpo.so.0
-PKGFILES_CSWlibgettextpo0 += $(call pkgfiles_lib,libgettextpo.so.0)
-RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibunistring0
-RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWggettext-data
-CHECKPKG_OVERRIDES_CSWlibgettextpo0 += surplus-dependency|CSWggettext-data
-OBSOLETED_BY_CSWlibgettextpo0 += CSWggettextrt
+PACKAGES += CSWlibgettextpo1
+SPKG_DESC_CSWlibgettextpo1 += GNU locale utilities, libgettextpo.so.1
+PKGFILES_CSWlibgettextpo1 += $(call pkgfiles_lib,libgettextpo.so.1)
+RUNTIME_DEP_PKGS_CSWlibgettextpo1 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibgettextpo1 += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWlibgettextpo1 += CSWlibunistring2
+RUNTIME_DEP_PKGS_CSWlibgettextpo1 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgettextpo1 += CSWggettext-data
+CHECKPKG_OVERRIDES_CSWlibgettextpo1 += surplus-dependency|CSWggettext-data
+OBSOLETED_BY_CSWlibgettextpo1 += CSWggettextrt
-PACKAGES += CSWlibgettextsrc0-18-3
-SPKG_DESC_CSWlibgettextsrc0-18-3 += GNU locale utilities, libgettextsrc-0.18.3.so
-PKGFILES_CSWlibgettextsrc0-18-3 += $(call pkgfiles_lib,libgettextsrc-0.18.3.so)
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWlibgettextlib0-18-3
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWlibncurses5
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWlibunistring0
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-3 += CSWggettext-data
-CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-3 += surplus-dependency|CSWggettext-data
-CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-3 += soname-equals-filename
+PACKAGES += CSWlibgettextsrc0-19-8
+SPKG_DESC_CSWlibgettextsrc0-19-8 += GNU locale utilities, libgettextsrc-0.19.8.so
+PKGFILES_CSWlibgettextsrc0-19-8 += $(call pkgfiles_lib,libgettextsrc-0.19.8.so)
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWlibgettextlib0-19-8
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWlibncurses6
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWlibunistring2
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-19-8 += CSWggettext-data
+CHECKPKG_OVERRIDES_CSWlibgettextsrc0-19-8 += surplus-dependency|CSWggettext-data
+CHECKPKG_OVERRIDES_CSWlibgettextsrc0-19-8 += soname-equals-filename
# On i386 only
-CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-3 += surplus-dependency|CSWlibxml2-2
-CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-3 += surplus-dependency|CSWlibncurses5
+CHECKPKG_OVERRIDES_CSWlibgettextsrc0-19-8 += surplus-dependency|CSWlibxml2-2
+CHECKPKG_OVERRIDES_CSWlibgettextsrc0-19-8 += surplus-dependency|CSWlibncurses6
-PACKAGES += CSWlibintl8
-SPKG_DESC_CSWlibintl8 += GNU locale utilities, libintl.so.8
-PKGFILES_CSWlibintl8 += $(call pkgfiles_lib,libintl.so.8)
-RUNTIME_DEP_PKGS_CSWlibintl8 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibintl8 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibintl8 += CSWggettext-data
-CHECKPKG_OVERRIDES_CSWlibintl8 += surplus-dependency|CSWggettext-data
-OBSOLETED_BY_CSWlibintl8 += CSWggettextrt
+PACKAGES += CSWlibintl9
+SPKG_DESC_CSWlibintl9 += GNU locale utilities, libintl.so.9
+PKGFILES_CSWlibintl9 += $(call pkgfiles_lib,libintl.so.9)
+RUNTIME_DEP_PKGS_CSWlibintl9 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibintl9 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibintl9 += CSWggettext-data
+CHECKPKG_OVERRIDES_CSWlibintl9 += surplus-dependency|CSWggettext-data
PACKAGES += CSWggettext-dev
SPKG_DESC_CSWggettext-dev = GNU locale utilities, development files
-# Why is this needed?
+# This is needed because these libs are the ones linked against, not symlinks as usual:
+# libgettextlib-0.19.8.so
+# libgettextsrc-0.19.8.so
PKGFILES_DEVEL_SHAREDLIBLINK =
PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL)
PKGFILES_CSWggettext-dev += $(PKGFILES_DOC)
@@ -124,10 +129,10 @@
PKGFILES_CSWggettest-dev += $(call baseisadirs,$(libdir),libintl.so)
PKGFILES_CSWggettext-data += /opt/csw/share/locale/.*\.mo
RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibasprintf0
-RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextlib0-18-3
+RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextlib0-19-8
RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextpo0
RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-17
-RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-18-3
+RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-19-8
RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibintl8
OBSOLETED_BY_CSWggettext-dev += CSWggettextdoc
CHECKPKG_OVERRIDES_CSWggettext-dev += missing-dependency|CSWperl
@@ -139,6 +144,10 @@
GARCOMPILER = GNU
+# Make sure libgettlib gets linked to the newly built libintl instead of the installed one
+# This is everything but RUNPATH_LINKER_FLAGS which is passed via LDFLAGS instead of LD_OPTIONS
+LD_OPTIONS = $(strip $($(GARCOMPILER)_LD_OPTIONS) $(LINKER_MAPS) $(LINKER_DIRECT) $(LINKER_IGNORE) $(EXTRA_LD_OPTIONS) $(_CATEGORY_LD_OPTIONS))
+
CONFIGURE_ARGS += $(DIRPATHS)
CONFIGURE_ARGS += --program-prefix=g
# Dont' depend on packages that depend on me
@@ -147,8 +156,16 @@
# No glibc
CONFIGURE_ARGS += --with-included-gettext
+CONFIGURE_ARGS += --disable-java
+CONFIGURE_ARGS += --disable-native-java
+
+# We need "grep -E"
+CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH)
+
+# While we are investigating
+BUILD_ARGS += V=1
+
BUILD64_LIBS_ONLY = 1
-#EXTRA_LINKER_FLAGS = -xnorunpath
MERGE_EXCLUDE_FILES = .*/charset.alias
MERGE_EXCLUDE_FILES += .*/locale.alias
@@ -156,45 +173,16 @@
COMPILE_ELISP = 1
-# Just 4 ACL tests are failing
-SKIPTEST ?= 1
-
include gar/category.mk
-#Include old libraries for compatibility with existing packages
-# TODO: Convert to modulated builds
+# This is an ugly workaround to circumvent libgettextlib.so getting linked against the
+# old libintl.so from /opt/csw/lib instead the newly built one
+pre-install:
+ perl -i.old -npe 's,-L$(libdir) -liconv,-liconv,g;' $(WORKSRC)/gettext-tools/gnulib-lib/libgettextlib.la
+ @$(MAKECOOKIE)
-post-install-isa-sparcv8plus:
- @mkdir $(INSTALLISADIR)/opt/csw/share/java
- @mv $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar $(INSTALLISADIR)/opt/csw/share/java
- $(MAKECOOKIE)
-
-post-install-isa-sparcv9:
- @rm $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar
- $(MAKECOOKIE)
-
-post-install-isa-pentium_pro:
- @mkdir $(INSTALLISADIR)/opt/csw/share/java
- @mv $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar $(INSTALLISADIR)/opt/csw/share/java
- $(MAKECOOKIE)
-
-post-install-isa-amd64:
- @rm $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar
- $(MAKECOOKIE)
-
post-merge-all:
@echo "Setting up gnu links..."
ginstall -d $(DESTDIR)$(prefix)/gnu
$(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);)
- @echo "Fixing usr/local and usr/share references..."
- @(cd $(PKGROOT); \
- gfind .$(docdir) .$(datadir)/aclocal -type f -print0 | \
- gxargs -0 perl -pi \
- -e "s#/usr/share#/opt/csw/share#g;" \
- -e "s#/usr/local#/opt/csw#g;"; \
- perl -pi \
- -e "s#/usr/share#/opt/csw/share#g;" \
- -e "s#/usr/local#/opt/csw#g;" \
- .$(bindir)/ggettextize \
- .$(infodir)/gettext.info; )
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/gettext/trunk/checksums
===================================================================
--- csw/mgar/pkg/gettext/trunk/checksums 2016-09-07 07:54:13 UTC (rev 25929)
+++ csw/mgar/pkg/gettext/trunk/checksums 2016-09-07 15:13:45 UTC (rev 25930)
@@ -1 +1 @@
-8949a57e82abe88274a93174ade515e4 gettext-0.19.1.tar.gz
+e83becf5dc4c29519a5ec5335d769764 gettext-0.19.8.tar.lz
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