CVSROOT: /cvsroot/lilypond
Module name: installers
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/10/06 09:08:09
Modified files:
linux/autopackage/specs/ghostscript: default.apspec.in
linux/autopackage/skeletons/@libpng.org/libpng: skeleton.1
linux/autopackage/skeletons/@gnu.org/guile: skeleton.1
linux/autopackage: GNUmakefile ChangeLog
Log message:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/specs/ghostscript/default.apspec.in.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/skeletons/@libpng.org/libpng/skeleton.1.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/skeletons/@gnu.org/guile/skeleton.1.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/GNUmakefile.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/ChangeLog.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
Patches:
Index: installers/linux/autopackage/ChangeLog
diff -u installers/linux/autopackage/ChangeLog:1.24
installers/linux/autopackage/ChangeLog:1.25
--- installers/linux/autopackage/ChangeLog:1.24 Wed Sep 7 21:41:05 2005
+++ installers/linux/autopackage/ChangeLog Thu Oct 6 09:08:09 2005
@@ -1,3 +1,19 @@
+2005-10-05 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * GNUmakefile ($(ghostscript-build)):
+ (downloads/libpng-$(libpng-version).tar.gz): Update changed URL.
+ (.PRECIOUS): Bugfixes: define $(packagesv).
+ (downloads/guile-$(guile-version).tar.gz): Fix url: typo.
+
+ * specs/ghostscript/default.apspec.in (programs): Require libpng
+ again.
+
+ * skeletons/@gnu.org/guile/skeleton.1 (SOFTWARE_VERSIONS): Check
+ for plain version.
+
+ * skeletons/@libpng.org/libpng/skeleton.1 (SOFTWARE_VERSIONS):
+ Check for plain version.
+
2005-09-07 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* specs/gmp/default.apspec.in:
Index: installers/linux/autopackage/GNUmakefile
diff -u installers/linux/autopackage/GNUmakefile:1.24
installers/linux/autopackage/GNUmakefile:1.25
--- installers/linux/autopackage/GNUmakefile:1.24 Wed Sep 7 21:44:50 2005
+++ installers/linux/autopackage/GNUmakefile Thu Oct 6 09:08:09 2005
@@ -57,12 +57,16 @@
autopackage-support = downloads/autopackage.tar.bz2
+iv = $(i)-$($(i)-version)
+packagesv = $(foreach i, $(packages), $(iv))
+
.PHONY: all clean nsis-root real-clean target-root upset $(packages)
.PRECIOUS: $(packages:%=specs/%/default.apspec.in)
.PRECIOUS: $(packagesv:%=specs/%/default.apspec.in)
-.PRECIOUS: $(packagesv:%=$(src-dir)/%/.stamp)
-.PRECIOUS: $(packagesv:%=$(src-dir)/%/autopackage/default.apspec)
-.PRECIOUS: $(packagesv:%=$(target-root)/etc/autopackage/%.stamp)
+# FIXME: gratuitous rebuilds, missing dependencies?
+#.PRECIOUS: $(packagesv:%=$(src-dir)/%/.stamp)
+#.PRECIOUS: $(packagesv:%=$(src-dir)/%/autopackage/default.apspec)
+#.PRECIOUS: $(packagesv:%=$(target-root)/etc/autopackage/%.stamp)
.PRECIOUS: $(packagesv:%=$(upload-dir)/%.$(ARCH).package)
default: all
@@ -73,7 +77,7 @@
rm -rf $(target-root)/etc/autopackage $(src-dir)/*/autopackage
$(upload-dir)/*package
clean-target:
- $(target-root)/bin/package remove lilypond guile gmp pango glib libtool
ghostscript
+ $(target-root)/bin/package remove lilypond guile gmp pango glib libtool
ghostscript libpng
rm -rf $(target-root)/etc/autopackage
.setup-stamp:
@@ -138,7 +142,7 @@
wget -P downloads
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs815/ghostscript-fonts-std-8.11.tar.gz
wget -P downloads
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs815/$(notdir $@)
downloads/libpng-$(libpng-version).tar.gz:
- wget -P downloads
ftp://ftp.simplesystems.org/pub/libpng/src/libpng-$(libpng-version)-config.tar.gz
+ wget -P downloads
ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-$(libpng-version)-config.tar.gz
tar xzf downloads/libpng-$(libpng-version)-config.tar.gz
mv libpng-$(libpng-version)-config libpng-$(libpng-version)
tar czf $@ libpng-$(libpng-version)
@@ -148,7 +152,7 @@
$(autopackage-gtk-support):
wget -P downloads
http://ftp.sunsite.dk/projects/autopackage/$(autopackage-version)/$(notdir $@)
downloads/guile-$(guile-version).tar.gz:
- wget -P downloads http://lilypond.org/downloads/guile/$(notdir $@)
+ wget -P downloads http://lilypond.org/download/guile/$(notdir $@)
$(LILYPOND_SRCDIR)/out/lilypond-$(lilypond-version).tar.gz:
cd $(LILYPOND_SRCDIR) && make dist
@@ -158,7 +162,6 @@
$(ASSUME_OLD) $@
# Dependencies
-iv = $(i)-$($(i)-version)
$(foreach i, $(packages), $(eval $(i)-build =
$(upload-dir)/$(iv).$(ARCH).package))
$(foreach i, $(packages), $(eval $(i)-install =
$(target-root)/etc/autopackage/$(iv).stamp))
@@ -199,11 +202,11 @@
# PARTLY Explicit dependencies -- for autopackage
$(guile-build): $(gettext-install) $(gmp-install)
$(pango-build): $(glib-install)
-#$(ghostscript-build): $(libpng-install)
+$(ghostscript-build): $(libpng-install)
$(lilypond-build): $(pango-install) $(ghostscript-install) $(guile-install)
# kugh
-#ghostscript-dependencies = libpng
+ghostscript-dependencies = libpng
pango-dependencies = glib libtool
lilypond-dependencies = pango ghostscript guile
guile-dependencies = gmp libtool
Index: installers/linux/autopackage/skeletons/@gnu.org/guile/skeleton.1
diff -u installers/linux/autopackage/skeletons/@gnu.org/guile/skeleton.1:1.3
installers/linux/autopackage/skeletons/@gnu.org/guile/skeleton.1:1.4
--- installers/linux/autopackage/skeletons/@gnu.org/guile/skeleton.1:1.3
Mon Aug 29 22:41:46 2005
+++ installers/linux/autopackage/skeletons/@gnu.org/guile/skeleton.1 Thu Oct
6 09:08:09 2005
@@ -11,13 +11,14 @@
Guile.
[Test]
-# libguile.so interface test
-#testForLib libguile.so.12 && INTERFACE_VERSIONS=" 12"
-guile1versions=`testForLib -v libguile.so.12`
-for v in $guile1versions; do
+name=guile
+major=12
+libversions=`testForLib -v lib$name.so.$major`
+for v in $libversions; do
minor=$( IFS=.; v=( $v ); echo ${v[1]} )
- INTERFACE_VERSIONS="12.$minor $INTERFACE_VERSIONS"
+ INTERFACE_VERSIONS="$major.$minor $INTERFACE_VERSIONS"
done
+SOFTWARE_VERSIONS="$INTERFACE_VERSIONS"
# FIXME: locateCommand foo --version does not work.
#SOFTWARE_VERSIONS=$(locateCommand guile --version 2>&1)
@@ -31,7 +32,13 @@
v="$(IFS=.; v=($SOFTWARE_VERSIONS); echo ${v[0]}.${v[1]}${v[2]})"
SOFTWARE_VERSIONS=$(countDownVersions $v)
fi
+
+if false; then # guile 1.6.4 is OK now
+
# FIXME: we need guile 1.6.7 and NOT 1.6.4. Both have interface 12.3
# so we use software version instead.
INTERFACE_VERSIONS=$SOFTWARE_VERSIONS
+
+fi
+
trace "guile: we set IFV to $INTERFACE_VERSIONS"
Index: installers/linux/autopackage/skeletons/@libpng.org/libpng/skeleton.1
diff -u
installers/linux/autopackage/skeletons/@libpng.org/libpng/skeleton.1:1.3
installers/linux/autopackage/skeletons/@libpng.org/libpng/skeleton.1:1.4
--- installers/linux/autopackage/skeletons/@libpng.org/libpng/skeleton.1:1.3
Sat Jun 4 20:18:33 2005
+++ installers/linux/autopackage/skeletons/@libpng.org/libpng/skeleton.1
Thu Oct 6 09:08:09 2005
@@ -11,35 +11,13 @@
libpng
[Test]
-if false; then
-testForLib libpng12.so.0 && INTERFACE_VERSIONS=" 0"
-SOFTWARE_VERSIONS=$INTERFACE_VERSIONS
-libpng12versions=`testForLib -v libpng12.so.0`
-for v in $libpng12versions; do
- minor=$(IFS=.; v=( $v ); echo ${v[1]})
- minor=$[ $minor / 100 ]
- INTERFACE_VERSIONS="0.$minor $INTERFACE_VERSIONS"
- SOFTWARE_VERSIONS="$(IFS=.; v=( $v ); echo ${v[1]}.${v[2]}.${v[3]})
$SOFTWARE_VERSIONS"
+major=12
+name=png
+##libpng appends major to library name
+##libversions=`testForLib -v lib$name.so.$major`
+libversions=`testForLib -v lib$name$major.so`
+for v in $libversions; do
+ minor=$( IFS=.; v=( $v ); echo ${v[1]} )
+ INTERFACE_VERSIONS="$major.$minor $INTERFACE_VERSIONS"
done
-else
-# FIXME: Red Hat ships libpng12 with unversioned symbols.
-# This test will only work if you have a library with symbols,
-# but I do not know how to test for a good library.
-# Maybe by running a pre-linked binary, but how to ship that
-# with a skeleton file? Must be tested on Red Hat anyway.
-INTERFACE_VERSIONS=
-mkdirs "$PREFIX/tmp"
-cat > "$PREFIX/tmp/png12.c" <<EOF
-int
-main ()
-{
- __asm__ (".symver png_info_init_12_0,[EMAIL PROTECTED]");
- return png_info_init_12_0 ();
-}
-EOF
-if gcc -o "$PREFIX/tmp/png12" "$PREFIX/tmp/png12.c" -lpng12 > /dev/null 2>&1;
then
- INTERFACE_VERSIONS="12 12.0 0 0.0"
-fi
-rm -f "$PREFIX/tmp/png12"* 2> /dev/null
-SOFTWARE_VERSIONS=$INTERFACE_VERSIONS
-fi
+SOFTWARE_VERSIONS="$INTERFACE_VERSIONS"
Index: installers/linux/autopackage/specs/ghostscript/default.apspec.in
diff -u installers/linux/autopackage/specs/ghostscript/default.apspec.in:1.10
installers/linux/autopackage/specs/ghostscript/default.apspec.in:1.11
--- installers/linux/autopackage/specs/ghostscript/default.apspec.in:1.10
Mon Aug 29 23:54:35 2005
+++ installers/linux/autopackage/specs/ghostscript/default.apspec.in Thu Oct
6 09:08:09 2005
@@ -65,10 +65,7 @@
echo '*' | import
[Prepare]
-# require @libpng.org/libpng 12
-# Always include libpng12, with versions. Do not know how to test that.
-
-# require @libpng.org/libpng 0
+require @libpng.org/libpng 12
#require jpeg, zlib
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
