[csw-devel] SF.net SVN: gar:[14412] csw/mgar/pkg
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Wed Apr 27 13:33:16 CEST 2011
Revision: 14412
http://gar.svn.sourceforge.net/gar/?rev=14412&view=rev
Author: dmichelsen
Date: 2011-04-27 11:33:16 +0000 (Wed, 27 Apr 2011)
Log Message:
-----------
libneon26: Make functional package
Modified Paths:
--------------
csw/mgar/pkg/libneon26/trunk/Makefile
csw/mgar/pkg/libneon26/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/libneon26/
csw/mgar/pkg/libneon26/Makefile
csw/mgar/pkg/libneon26/branches/
csw/mgar/pkg/libneon26/tags/
Removed Paths:
-------------
csw/mgar/pkg/libneon26/Makefile
csw/mgar/pkg/libneon26/branches/
csw/mgar/pkg/libneon26/tags/
csw/mgar/pkg/libneon26/tags/neon-0.29.1,REV=2009.12.17/
csw/mgar/pkg/libneon26/tags/neon-0.29.3,REV=2010.02.25/
Deleted: csw/mgar/pkg/libneon26/Makefile
===================================================================
--- csw/mgar/pkg/neon/Makefile 2011-04-26 02:47:57 UTC (rev 14405)
+++ csw/mgar/pkg/libneon26/Makefile 2011-04-27 11:33:16 UTC (rev 14412)
@@ -1,15 +0,0 @@
-# vim: ft=make ts=4 sw=4 noet
-
-default:
- @echo "You are in the pkg/ directory."
-
-%:
- $(MAKE) -C trunk $*
-
-paranoid-%:
- $(MAKE) -C trunk $* || exit 2
-
-export BUILDLOG ?= $(shell pwd)/buildlog.txt
-
-report-%:
- $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG)
Copied: csw/mgar/pkg/libneon26/Makefile (from rev 14394, csw/mgar/pkg/neon/Makefile)
===================================================================
--- csw/mgar/pkg/libneon26/Makefile (rev 0)
+++ csw/mgar/pkg/libneon26/Makefile 2011-04-27 11:33:16 UTC (rev 14412)
@@ -0,0 +1,15 @@
+# vim: ft=make ts=4 sw=4 noet
+
+default:
+ @echo "You are in the pkg/ directory."
+
+%:
+ $(MAKE) -C trunk $*
+
+paranoid-%:
+ $(MAKE) -C trunk $* || exit 2
+
+export BUILDLOG ?= $(shell pwd)/buildlog.txt
+
+report-%:
+ $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG)
Modified: csw/mgar/pkg/libneon26/trunk/Makefile
===================================================================
--- csw/mgar/pkg/neon/trunk/Makefile 2011-04-26 02:47:57 UTC (rev 14405)
+++ csw/mgar/pkg/libneon26/trunk/Makefile 2011-04-27 11:33:16 UTC (rev 14412)
@@ -1,9 +1,8 @@
NAME = neon
-VERSION = 0.29.5
+VERSION = 0.26.4
CATEGORIES = lib
-EXTRA_MODULATORS = VERSION FEATURES
-MODULATIONS_VERSION = 0.26.4 0.29.5
+EXTRA_MODULATORS = FEATURES
MODULATIONS_FEATURES = minimal full
DESCRIPTION = Neon HTTP and WebDAV client library
@@ -15,31 +14,44 @@
endef
MASTER_SITES = http://www.webdav.org/$(NAME)/
-SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION), $(NAME)-$(VERSION).tar.gz)
-DISTFILES = $(SOURCEFILES)
+DISTFILES = $(DISTNAME).tar.gz
DISTFILES += COPYING
-NOEXTRACT = $(filter-out $(NAME)-$(VERSION).tar.gz,$(SOURCEFILES))
+PACKAGES += CSWlibneon26
+CATALOGNAME_CSWlibneon26 = libneon26
+SPKG_DESC_CSWlibneon26 = Neon HTTP and WebDAV client library, libneon.so.26
+PKGFILES_CSWlibneon26 += $(call pkgfiles_lib,libneon.so.26)
+RUNTIME_DEP_PKGS_CSWlibneon26 += CSWexpat
+RUNTIME_DEP_PKGS_CSWlibneon26 += CSWosslrt
+RUNTIME_DEP_PKGS_CSWlibneon26 += CSWzlib
+RUNTIME_DEP_PKGS_CSWlibneon26 += CSWlibintl8
-PACKAGES = CSWneon CSWneonfull CSWneon-devel
+PACKAGES += CSWlibneon26-feature
+CATALOGNAME_CSWlibneon26_feature = libneon26_feature
+SPKG_DESC_CSWlibneon26-feature = Neon HTTP and WebDAV client library with all features enabled, supersedes libneon.so.26
+PKGFILES_CSWlibneon26-feature = $(call pkgfiles_lib,libneon-feature.so.26)
+RUNTIME_DEP_PKGS_CSWlibneon26-feature += CSWexpat
+RUNTIME_DEP_PKGS_CSWlibneon26-feature += CSWosslrt
+RUNTIME_DEP_PKGS_CSWlibneon26-feature += CSWzlib
+RUNTIME_DEP_PKGS_CSWlibneon26-feature += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibneon26-feature += CSWkrb5lib
-CATALOGNAME_CSWneon = neon
-CATALOGNAME_CSWneonfull = neon_full
-CATALOGNAME_CSWneon-devel = neon_devel
+# This comes from krb5-config --libs
+CHECKPKG_OVERRIDES_CSWlibneon26-feature += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libneon-feature.so.26.0.4
-RUNTIME_DEP_PKGS_CSWneon = CSWexpat CSWosslrt CSWzlib CSWggettextrt
-RUNTIME_DEP_PKGS_CSWneonfull = CSWexpat CSWosslrt CSWzlib CSWggettextrt CSWpakchois CSWlibproxy CSWkrb5lib
-RUNTIME_DEP_PKGS_CSWneon-devel = CSWneon
+# These are artifacts of the feature lib being a regular one.
+# As it is never linked against the soname doesn't matter here and the package name
+# is obviously different from the soname in this case.
+CHECKPKG_OVERRIDES_CSWlibneon26-feature += soname-not-part-of-filename|soname=libneon.so.26|filename=libneon-feature.so.26.0.4
+CHECKPKG_OVERRIDES_CSWlibneon26-feature += soname-not-part-of-filename|soname=libneon.so.26|filename=libneon-feature.so.26.0.4
+CHECKPKG_OVERRIDES_CSWlibneon26-feature += shared-lib-pkgname-mismatch|sonames=libneon.so.26|pkgname=CSWlibneon26-feature|expected=CSWlibneon26|
-BUILD_DEP_PKGS = $(sort $(RUNTIME_DEP_PKGS_CSWneon) $(RUNTIME_DEP_PKGS_CSWneonfull))
+# These will go away after release
+CHECKPKG_OVERRIDES_CSWlibneon26 += file-collision|/opt/csw/lib/libneon.so.26|CSWlibneon26|CSWneon
+CHECKPKG_OVERRIDES_CSWlibneon26 += file-collision|/opt/csw/lib/sparcv9/libneon.so.26|CSWlibneon26|CSWneon
-SPKG_DESC_CSWneon = Neon HTTP and WebDAV client library (minimal dependencies)
-SPKG_DESC_CSWneonfull = Neon HTTP and WebDAV client library (full featured)
-SPKG_DESC_CSWneon-devel = Neon HTTP and WebDAV development support
+BUILD_DEP_PKGS = CSWossldevel
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-
CONFIGURE_ARGS_features-minimal = --without-libproxy --without-pakchois --without-gssapi
CONFIGURE_ARGS_features-full = --with-libproxy --with-packchois
@@ -50,113 +62,46 @@
CONFIGURE_ARGS += $(CONFIGURE_ARGS_features-$(FEATURES))
BUILD64 = 1
-NOISAEXEC = 1
+# Tests fail, investigate later
+SKIPTEST ?= 1
+
+# Make sure to use a defined timezone or tests may fail
+TEST_OVERRIDE_VARS = TZ
+TEST_OVERRIDE_VAR_TZ = GMT
+
# Omit version number suffix on docdir
INSTALL_OVERRIDE_VARS = docdir
INSTALL_OVERRIDE_VAR_docdir = $(datadir)/doc/neon
-# isa-sparcv8-garversion-0.26.4-features-minimal isa-sparcv8-garversion-0.26.4-features-full isa-sparcv8-garversion-0.29.5-features-minimal isa-sparcv8-garversion-0.29.5-features-full isa-sparcv9-garversion-0.26.4-features-minimal isa-sparcv9-garversion-0.26.4-features-full isa-sparcv9-garversion-0.29.5-features-minimal isa-sparcv9-garversion-0.29.5-features-full
+EXTRA_PAX_ARGS_isa-sparcv8-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libneon\)\(\.so\.\d+\..*\),\1-feature\2,p"
+EXTRA_PAX_ARGS_isa-i386-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libneon\)\(\.so\.\d+\..*\),\1-feature\2,p"
+EXTRA_PAX_ARGS_isa-sparcv9-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\.$(libdir)/libneon\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libneon-feature\1,p"
+EXTRA_PAX_ARGS_isa-amd64-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\.$(libdir)/libneon\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libneon-feature\1,p"
-# We select pkgconfig for minimal library bindings. As libneon is self-contained (links
-# to all necessary libs directly) the full version can simly be linked in.
-EXTRA_PAX_ARGS_features-full = -s ",.*/pkgconfig.*,,"
-EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_features-$(FEATURES))
+MERGE_SCRIPTS_isa-default-features-minimal = copy-only
+MERGE_DIRS_isa-default-features-minimal = $(libdir)
+MERGE_SCRIPTS_isa-default64-features-minimal = copy-relocated-only
+MERGE_DIRS_isa-default64-features-minimal = $(libdir)
+MERGE_SCRIPTS_isa-default-features-full = copy-only
+MERGE_DIRS_isa-default-features-full = $(libdir)
+MERGE_SCRIPTS_isa-default64-features-full = copy-relocated-only
+MERGE_DIRS_isa-default64-features-full = $(libdir)
-EXTRA_PAX_ARGS-32 += -s ",\(\.$(libdir)/libneon\)\(\.so\.26\.0\.4\),\1-$(FEATURES)\2,p"
-EXTRA_PAX_ARGS-32 += -s ",\(\.$(libdir)/libneon\)\(\.so\.27\.2\.3\),\1-$(FEATURES)\2,p"
-EXTRA_PAX_ARGS-64 += -s ",\.$(libdir)/libneon\(\.so\.26\.0\.4\),.$(libdir_install)/$(ISA)/libneon-$(FEATURES)\1,p"
-EXTRA_PAX_ARGS-64 += -s ",\.$(libdir)/libneon\(\.so\.27\.2\.3\),.$(libdir_install)/$(ISA)/libneon-$(FEATURES)\1,p"
-EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS-$(MEMORYMODEL))
-
-MERGE_SCRIPTS_isa-default-garversion-0.26.4-features-minimal = copy-only
-MERGE_DIRS_isa-default-garversion-0.26.4-features-minimal = $(libdir)
-MERGE_SCRIPTS_isa-default64-garversion-0.26.4-features-minimal = copy-relocated-only
-MERGE_DIRS_isa-default64-garversion-0.26.4-features-minimal = $(libdir)
-MERGE_SCRIPTS_isa-default-garversion-0.26.4-features-full = copy-only
-MERGE_DIRS_isa-default-garversion-0.26.4-features-full = $(libdir)
-MERGE_SCRIPTS_isa-default64-garversion-0.26.4-features-full = copy-relocated-only
-MERGE_DIRS_isa-default64-garversion-0.26.4-features-full = $(libdir)
-
-MERGE_SCRIPTS_isa-default-garversion-0.29.5-features-minimal = copy-all
-MERGE_SCRIPTS_isa-default64-garversion-0.29.5-features-minimal = copy-relocated-only
-MERGE_DIRS_isa-default64-garversion-0.29.5-features-minimal = $(bindir) $(sbindir) $(libexecdir) $(libdir)
-MERGE_SCRIPTS_isa-default-garversion-0.29.5-features-full = copy-only
-MERGE_DIRS_isa-default-garversion-0.29.5-features-full = $(libdir)
-MERGE_SCRIPTS_isa-default64-garversion-0.29.5-features-full = copy-relocated-only
-MERGE_DIRS_isa-default64-garversion-0.29.5-features-full = $(libdir)
-
EXTRA_LINKER_FLAGS = -lintl
-PKGFILES_CSWneonfull = .*-full.*
-PKGFILES_CSWneon-devel = $(PKGFILES_DEVEL)
-PKGFILES_CSWneon-devel += $(docdir)/.*
-
-
-FEATURE_LIBRARIES = libneon.26 libneon64.26
-FEATURE_LIBRARIES += libneon.27 libneon64.27
-FEATURES_libneon.26 = $(libdir)/libneon.so.26.0.4
-FEATURES_libneon.26 += libneon-minimal.so.26.0.4
-FEATURES_libneon.26 += libneon-full.so.26.0.4
-FEATURES_libneon64.26 = $(libdir)/$(ISA_DEFAULT64)/libneon.so.26.0.4
-FEATURES_libneon64.26 += libneon-minimal.so.26.0.4
-FEATURES_libneon64.26 += libneon-full.so.26.0.4
-FEATURES_libneon.27 = $(libdir)/libneon.so.27.2.3
-FEATURES_libneon.27 += libneon-minimal.so.27.2.3
-FEATURES_libneon.27 += libneon-full.so.27.2.3
-FEATURES_libneon64.27 = $(libdir)/$(ISA_DEFAULT64)/libneon.so.27.2.3
-FEATURES_libneon64.27 += libneon-minimal.so.27.2.3
-FEATURES_libneon64.27 += libneon-full.so.27.2.3
-
-# This comes from krb5-config --libs
-CHECKPKG_OVERRIDES_CSWneonfull += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libneon-full.so.26.0.4
-CHECKPKG_OVERRIDES_CSWneonfull += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libneon-full.so.27.2.3
-
-CHECKPKG_OVERRIDES_CSWneon-devel += surplus-dependency|CSWneon
-CHECKPKG_OVERRIDES_CSWneonfull += surplus-dependency|CSWpakchois
-CHECKPKG_OVERRIDES_CSWneonfull += surplus-dependency|CSWosslrt
-CHECKPKG_OVERRIDES_CSWneonfull += surplus-dependency|CSWggettextrt
-CHECKPKG_OVERRIDES_CSWneonfull += surplus-dependency|CSWzlib
-CHECKPKG_OVERRIDES_CSWneonfull += surplus-dependency|CSWexpat
-CHECKPKG_OVERRIDES_CSWneonfull += surplus-dependency|CSWkrb5lib
-CHECKPKG_OVERRIDES_CSWneonfull += surplus-dependency|CSWlibproxy
-CHECKPKG_OVERRIDES_CSWneon += surplus-dependency|CSWexpat
-CHECKPKG_OVERRIDES_CSWneon += surplus-dependency|CSWosslrt
-CHECKPKG_OVERRIDES_CSWneon += surplus-dependency|CSWggettextrt
-CHECKPKG_OVERRIDES_CSWneon += surplus-dependency|CSWzlib
-
-
include gar/category.mk
-#post-install-modulated:
-# rm -f $(DESTDIR)$(libdir)/libneon.so
-# gln -s libneon.so.27 $(DESTDIR)$(libdir)/libneon.so
-# @$(MAKECOOKIE)
+post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: EXTRA_LD_OPTIONS = -f libneon-feature.so.26
+post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal:
+ rm -f $(WORKSRC)/src/libneon.la
+ $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(WORKSRC) $(BUILD_ARGS)
+ @$(MAKECOOKIE)
-# cc -G -c empty.c
-# ld -G -h libneon-minimal.so.26 -o stub-libneon.so.26 empty.o
-# ld -R /opt/csw/lib -G -h libneon.so.26 -o libneon.so.26 -f libneon-full.so.26 -f libneon-max.so.26 stub-libneon.so.26
-
-# 32/64 bit detection is done by looking at the last directory component and
-# guessing by ISA if it is 32 or 64 bit
-
-#post-merge: _LDFLAGS-32=
-#post-merge: _LDFLAGS-64=-64
-#post-merge:
-#post-merge:
-# cd $(WORKDIR); touch empty.c; $(CC) -G -c empty.c
-# cd $(WORKDIR); touch empty64.c; $(CC) -m64 -G -c empty64.c
-# $(foreach L,$(FEATURE_LIBRARIES),\
-# ld $(_LDFLAGS-$(MEMORYMODEL_$(lastword $(subst /, ,$(dir $(firstword $(FEATURES_$L))))))) \
-# -G -h $(word 2,$(FEATURES_$L)) -o $(WORKDIR)/stub-$(notdir $(firstword $(FEATURES_$L))) $(WORKDIR)/empty$(MEMORYMODEL_$(lastword $(subst /, ,$(dir $(firstword $(FEATURES_$L)))))).o;\
-# ld $(_LDFLAGS-$(MEMORYMODEL_$(lastword $(subst /, ,$(dir $(firstword $(FEATURES_$L))))))) \
-# -R $(patsubst %/,%,$(dir $(firstword $(FEATURES_$L)))) \
-# -G -h `/usr/ccs/bin/dump -Lv $(dir $(firstword $(FEATURES_$L)))/$(word 2,$(FEATURES_$L)) | awk '$$2 == "SONAME" { print $$3 }'` \
-# -o $(PKGROOT)$(firstword $(FEATURES_$L)) \
-# $(foreach F,$(wordlist 3,$(words $(FEATURES_$L)),$(FEATURES_$L)),-F $F) \
-# $(WORKDIR)/stub-$(notdir $(firstword $(FEATURES_$L))); \
-# )
-# @$(MAKECOOKIE)
-
-# ld -G -o ~/libtidy-minimal.so -z allextract -h libtidy.so.26 -F libtidy-full.so.26 /opt/csw/lib/libtidy.a
-
+post-merge:
+ @# This is needed because the substitutions from pax args do not change the
+ @# contents of the symlink
+ rm -f $(PKGROOT)$(libdir)/libneon-feature.so.26
+ ln -s libneon-feature.so.26.0.4 $(PKGROOT)$(libdir)/libneon-feature.so.26
+ rm -f $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libneon-feature.so.26
+ ln -s libneon-feature.so.26.0.4 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libneon-feature.so.26
Modified: csw/mgar/pkg/libneon26/trunk/checksums
===================================================================
--- csw/mgar/pkg/neon/trunk/checksums 2011-04-26 02:47:57 UTC (rev 14405)
+++ csw/mgar/pkg/libneon26/trunk/checksums 2011-04-27 11:33:16 UTC (rev 14412)
@@ -1,2 +1 @@
2d11fff51ffa856fc6b5d4bd801d6cc4 neon-0.26.4.tar.gz
-ff369e69ef0f0143beb5626164e87ae2 neon-0.29.5.tar.gz
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