[csw-devel] SF.net SVN: gar:[16438] csw/mgar/pkg/libgsf/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri Dec 9 11:54:08 CET 2011
Revision: 16438
http://gar.svn.sourceforge.net/gar/?rev=16438&view=rev
Author: dmichelsen
Date: 2011-12-09 10:54:08 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
libgsf/trunk: Split off legacy libs, rework dependencies
Modified Paths:
--------------
csw/mgar/pkg/libgsf/trunk/Makefile
Removed Paths:
-------------
csw/mgar/pkg/libgsf/trunk/files/fixme.sh
csw/mgar/pkg/libgsf/trunk/files/fixme2.sh
csw/mgar/pkg/libgsf/trunk/files/libgsf-1.so.1.9.1.i
csw/mgar/pkg/libgsf/trunk/files/libgsf-1.so.1.9.1.s
csw/mgar/pkg/libgsf/trunk/files/libgsf-gnome-1.so.1.9.1.i
csw/mgar/pkg/libgsf/trunk/files/libgsf-gnome-1.so.1.9.1.s
Modified: csw/mgar/pkg/libgsf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgsf/trunk/Makefile 2011-12-09 10:45:27 UTC (rev 16437)
+++ csw/mgar/pkg/libgsf/trunk/Makefile 2011-12-09 10:54:08 UTC (rev 16438)
@@ -21,22 +21,52 @@
BUILD_DEP_PKGS += CSWglib2devel
BUILD_DEP_PKGS += CSWlibxml2devel
-RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibbz2-1-0
-RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgsf += CSWgtk2
-RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibbonobo2
-RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibgio2-0-0
+PACKAGES += CSWlibgsf1-114
+SPKG_DESC_CSWlibgsf1-114 = GNOME structured file library, libgsf-1.so.114
+PKGFILES_CSWlibgsf1-114 += $(call pkgfiles_lib,libgsf-1.so.114)
+PKGFILES_CSWlibgsf1-114 += $(sharedstatedir)/locale/.*\.mo
+RUNTIME_DEP_PKGS_CSWlibgsf1-114 += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWlibgsf1-114 += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWlibgsf1-114 += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWlibgsf1-114 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibgsf1-114 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgsf1-114 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibgsf1-114 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibgsf1-114 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibgsf1-114 += CSWlibgio2-0-0
-# No package split yet
-CHECKPKG_OVERRIDES_CSWlibgsf += shared-lib-package-contains-so-symlink
-CHECKPKG_OVERRIDES_CSWlibgsf += shared-lib-pkgname-mismatch
+PACKAGES += CSWlibgsf-gnome1-114
+SPKG_DESC_CSWlibgsf-gnome1-114 = GNOME structured file library, libgsf-gnome1.so.114
+PKGFILES_CSWlibgsf-gnome1-114 += $(call pkgfiles_lib,libgsf-gnome-1.so.114)
+RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWorbit2
+RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWlibgsf1-114
+RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWlibbonobo2
+RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWlibgio2-0-0
+PACKAGES += CSWlibgsf-dev
+SPKG_DESC_CSWlibgsf-dev = Development files for libgsf-1.so.114 and libgsf-gnome1.so.114
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWlibgsf1-114
+RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWlibgsf-gnome1-114
+RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWgtk2
+RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWlibgio2-0-0
+
# The -L/opt/csw/lib is too early and disturbs the build with the installed libgsf
LINKER_FLAGS =
@@ -54,11 +84,3 @@
include gar/category.mk
PATH := /opt/csw/gnu:$(PATH)
-
-post-install-isa-sparcv8plus:
- @cp -p $(FILEDIR)/libgsf-1.so.1.9.1.s $(INSTALLISADIR)$(libdir)/libgsf-1.so.1
- @cp -p $(FILEDIR)/libgsf-gnome-1.so.1.9.1.s $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1
-
-post-install-isa-pentium_pro:
- @cp -p $(FILEDIR)/libgsf-1.so.1.9.1.i $(INSTALLISADIR)$(libdir)/libgsf-1.so.1
- @cp -p $(FILEDIR)/libgsf-gnome-1.so.1.9.1.i $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1
Deleted: csw/mgar/pkg/libgsf/trunk/files/fixme.sh
===================================================================
--- csw/mgar/pkg/libgsf/trunk/files/fixme.sh 2011-12-09 10:45:27 UTC (rev 16437)
+++ csw/mgar/pkg/libgsf/trunk/files/fixme.sh 2011-12-09 10:54:08 UTC (rev 16438)
@@ -1,51 +0,0 @@
-#!/bin/bash
-####################################################
-#
-# fixme.sh
-# Intended to remove the use of libtool's
-# pseudo-libraries for opencsw builds.
-#
-# Author: Mike Watters mwatters_at_opencsw.org
-# Initial Version: 0.1
-#
-####################################################
-
-umask 0022
-PATH=/opt/csw/bin
-
-if [ $# -ne 1 ]; then
- gecho "USAGE: $(basename $0) WORKSRC"
- exit 1
-fi
-BASEPATH=$1
-
-## Fix Makefiles
-for mk in $(gfind ${BASEPATH} -name Makefile -print); do
- LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \
- gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/")
-
- for file in ${LT_FILES}; do
- LIB_NAME=$(ggrep 'dlname=' ${file} | \
- gsed -e "s/.*'\(.*\)'/\1/" \
- -e "s/^lib//" \
- -e "s/\.so.*$//")
- fixpath=$(gecho $file |gsed 's/\//\\\//g')
- gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new
- gmv Makefile.new ${mk}
- gchmod +x ${mk}
- done
-done
-
-## Fix libtool Script
-for lt in $(gfind ${BASEPATH} -name libtool -print); do
- gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new
- gmv ${lt}.new ${lt}
- gchmod +x ${lt}
-done
-
-for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do
- gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new
- gmv ${LTMAIN}.new ${LTMAIN}
- gchmod +x ${LTMAIN}
-done
-
Deleted: csw/mgar/pkg/libgsf/trunk/files/fixme2.sh
===================================================================
--- csw/mgar/pkg/libgsf/trunk/files/fixme2.sh 2011-12-09 10:45:27 UTC (rev 16437)
+++ csw/mgar/pkg/libgsf/trunk/files/fixme2.sh 2011-12-09 10:54:08 UTC (rev 16438)
@@ -1,29 +0,0 @@
-#!/bin/bash
-####################################################
-#
-# fixme2.sh
-# Intended to patch libtool so relink isn't
-# performend during install
-#
-# Loosely based on Mike Watters fixme.sh
-#
-# Author: Roger Hakansson hson at opencsw.org
-# Initial Version: 0.1
-#
-####################################################
-
-umask 0022
-PATH=/opt/csw/bin
-
-if [ $# -ne 1 ]; then
- gecho "USAGE: $(basename $0) WORKSRC"
- exit 1
-fi
-BASEPATH=$1
-
-## Fix libtool Script
-for lt in $(gfind ${BASEPATH} -name libtool -print); do
- gsed 's/test "$mode" != relink && rpath/rpath/' ${lt} > ${lt}.new
- gmv ${lt}.new ${lt}
- gchmod +x ${lt}
-done
Deleted: csw/mgar/pkg/libgsf/trunk/files/libgsf-1.so.1.9.1.i
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/libgsf/trunk/files/libgsf-1.so.1.9.1.s
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/libgsf/trunk/files/libgsf-gnome-1.so.1.9.1.i
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/libgsf/trunk/files/libgsf-gnome-1.so.1.9.1.s
===================================================================
(Binary files differ)
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