[csw-devel] SF.net SVN: gar:[4786] csw/mgar/pkg/pango/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Sat May 9 17:30:18 CEST 2009
Revision: 4786
http://gar.svn.sourceforge.net/gar/?rev=4786&view=rev
Author: dmichelsen
Date: 2009-05-09 15:30:18 +0000 (Sat, 09 May 2009)
Log Message:
-----------
pango: Use STRIP_LIBTOOL
Modified Paths:
--------------
csw/mgar/pkg/pango/trunk/Makefile
csw/mgar/pkg/pango/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/pango/trunk/files/fixme.sh
Modified: csw/mgar/pkg/pango/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pango/trunk/Makefile 2009-05-09 15:22:09 UTC (rev 4785)
+++ csw/mgar/pkg/pango/trunk/Makefile 2009-05-09 15:30:18 UTC (rev 4786)
@@ -12,8 +12,7 @@
MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/pango/1.24/
DISTNAME = pango-$(GARVERSION)
-DISTFILES = $(DISTNAME).tar.bz2
-DISTFILES += fixme.sh
+DISTFILES = $(DISTNAME).tar.bz2
PACKAGES = CSWpango CSWpangodevel CSWpangodoc
CATALOGNAME_CSWpango = libpango
@@ -43,6 +42,8 @@
CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
# CONFIGURE_ARGS += --with-included-modules
+STRIP_LIBTOOL = 1
+
# Dynamic prototype
PKGFILES_CSWpangodevel = $(PKGFILES_DEVEL)
PKGFILES_CSWpangodoc = $(sharedstatedir)/gtk-doc/.*
@@ -54,9 +55,3 @@
include gar/category.mk
-post-configure-modulated:
- @echo " ==> Fixing libtool files"
- @$(DOWNLOADDIR)/fixme.sh $(WORKSRC)
- @$(MAKECOOKIE)
-
-
Modified: csw/mgar/pkg/pango/trunk/checksums
===================================================================
--- csw/mgar/pkg/pango/trunk/checksums 2009-05-09 15:22:09 UTC (rev 4785)
+++ csw/mgar/pkg/pango/trunk/checksums 2009-05-09 15:30:18 UTC (rev 4786)
@@ -1,2 +1 @@
-34f5b20f6caf282b2533784fbb1b4395 download/fixme.sh
7bc6c884d847cabc613e4c6d663771f5 download/pango-1.24.2.tar.bz2
Deleted: csw/mgar/pkg/pango/trunk/files/fixme.sh
===================================================================
--- csw/mgar/pkg/pango/trunk/files/fixme.sh 2009-05-09 15:22:09 UTC (rev 4785)
+++ csw/mgar/pkg/pango/trunk/files/fixme.sh 2009-05-09 15:30:18 UTC (rev 4786)
@@ -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
-
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