CVSROOT: /cvsroot/lilypond
Module name: installers
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/08/29 11:47:57
Modified files:
linux/autopackage/specs/lilypond: default.apspec.in
linux/autopackage/specs/guile: default.apspec.in
linux/autopackage/specs/glib: default.apspec.in
linux/autopackage/skeletons/@gnu.org/guile: skeleton.1
linux/autopackage: GNUmakefile ChangeLog
Added files:
linux/autopackage: guile-1.7.patch
Log message:
* skeletons/@gnu.org/guile/skeleton.1:
* specs/lilypond/default.apspec.in:
* specs/guile/default.apspec.in:
* GNUmakefile: Update do guile-1.7.2.reloc by applying:
* guile-1.7.patch:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/specs/lilypond/default.apspec.in.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/specs/guile/default.apspec.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/specs/glib/default.apspec.in.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/skeletons/@gnu.org/guile/skeleton.1.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/guile-1.7.patch?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/GNUmakefile.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/ChangeLog.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
Patches:
Index: installers/linux/autopackage/ChangeLog
diff -u installers/linux/autopackage/ChangeLog:1.21
installers/linux/autopackage/ChangeLog:1.22
--- installers/linux/autopackage/ChangeLog:1.21 Sun Aug 28 23:15:42 2005
+++ installers/linux/autopackage/ChangeLog Mon Aug 29 11:47:57 2005
@@ -1,3 +1,11 @@
+2005-08-29 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * skeletons/@gnu.org/guile/skeleton.1:
+ * specs/lilypond/default.apspec.in:
+ * specs/guile/default.apspec.in:
+ * GNUmakefile: Update do guile-1.7.2.reloc by applying:
+ * guile-1.7.patch:
+
2005-08-29 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* GNUmakefile (specs/%/default.apspec.in): bugfix: relative path
Index: installers/linux/autopackage/GNUmakefile
diff -u installers/linux/autopackage/GNUmakefile:1.19
installers/linux/autopackage/GNUmakefile:1.20
--- installers/linux/autopackage/GNUmakefile:1.19 Sun Aug 28 23:15:42 2005
+++ installers/linux/autopackage/GNUmakefile Mon Aug 29 11:47:57 2005
@@ -24,14 +24,15 @@
glib-version = 2.6.4
ghostscript-version = 8.15
libpng-version = 1.2.8
-###guile-version = 1.7.2.reloc
-guile-version = 1.6.7
+guile-version = 1.7.2.reloc
PATH := $(target-root)/bin:$(PATH)
+LD_LIBRARY_PATH := $(target-root)/lib:$(LD_LIBRARY_PATH)
PKG_CONFIG_PATH := $(target-root)/lib/pkgconfig:$(PKG_CONFIG_PATH)
-##GUILE_LOAD_PATH := $(target-root)/share/guile/1.7:$(GUILE_LOAD_PATH)
-GUILE_LOAD_PATH := $(target-root)/share/guile/1.6:$(GUILE_LOAD_PATH)
+GUILE_LOAD_PATH := $(target-root)/share/guile/1.7:$(GUILE_LOAD_PATH)
+##GUILE_LOAD_PATH := $(target-root)/share/guile/1.6:$(GUILE_LOAD_PATH)
export PATH
+export LD_LIBRARY_PATH
export PKG_CONFIG_PATH
export GUILE_LOAD_PATH
@@ -62,7 +63,13 @@
default: all
-all: lilypond lilypond-upgrade
+all: lilypond lilypond-upgrade clean-target
+
+clean:
+ rm -rf $(target-root)/etc/autopackage $(src-dir)/*/autopackage
$(upload-dir)/*package
+
+clean-target:
+ $(target-root)/bin/package remove lilypond pango glib ghostscript
libpng
.setup-stamp:
mkdir -p $(upload-dir) $(src-dir)
@@ -80,10 +87,9 @@
name=$(shell basename $(shell dirname $@));\
ball=$(download-dir)/$$name.tar.gz;\
tar -C $(src-dir) -zxf $$ball
- $(ASSUME_OLD)
+ touch $@
specs/%/default.apspec.in:
- echo bla
ln -s $(shell expr $@ : 'specs/\([^-]*\)') $(shell dirname $@)
src/%/autopackage/default.apspec: specs/%/default.apspec.in
@@ -93,6 +99,7 @@
cp -pv $(autopackage-support) $(dir $@)/packages
cp -pv $(autopackage-gtk-support) $(dir $@)/packages
$(foreach i, $($(shell echo $@ | sed -e '[EMAIL PROTECTED]/@@' -e
's/-.*//')-dependencies), cp $(upload-dir)/$(i)-$($(i)-version).$(ARCH).package
$(dir $@)/packages &&) true
+ [ -n "$($(shell echo $@ | sed -e '[EMAIL PROTECTED]/@@' -e
's/-.*//')-dependencies)" ] || rm -rf $(dir $@)/packages
test -e $(shell dirname $(shell dirname $@))/config.status || (cd
$(shell dirname $(shell dirname $@)) && ./configure)
dirdir = $(dir $(patsubst %/, %, $(dir $1)))
@@ -107,7 +114,7 @@
$(upload-dir)/%-upgrade.$(ARCH).package: src/%/autopackage/default.apspec
rm -rf $(dir $<)/packages
cd $(call dirdir, $<) && makeinstaller $(MAKEINSTALLER_FLAGS) -mc
- mv $(call dirdir, $<)/$(notdir $@) $@
+ mv $(call dirdir, $<)/$(patsubst
%-upgrade.$(ARCH).package,%.$(ARCH).package, $(notdir $@)) $@
downloads/lilypond-$(lilypond-version).tar.gz:
$(LILYPOND_SRCDIR)/out/lilypond-$(lilypond-version).tar.gz
cp $< $@
@@ -149,7 +156,9 @@
$(foreach i, $(packages), $(eval $(i)-install: $($(i)-install)))
# All packages depend on their installation in target
-$(foreach i, $(packages), $(eval $(i): $($(i)-install)))
+$(foreach i, $(filter-out lilypond%, packages), $(eval $(i): $($(i)-install)))
+lilypond: lilypond-build
+lilypond-upgrade:
$(upload-dir)/lilypond-$(lilypond-version)-upgrade.$(ARCH).package
# Building a package depends on an unpacked source tree
$(foreach i, $(packages), $(eval $($(i)-build): $(src-dir)/$(iv)/.stamp))
@@ -183,14 +192,3 @@
pango-dependencies = glib
lilypond-dependencies = pango ghostscript guile
-# do not install lily
-$(target-root)/etc/autopackage/lilypond-$(lilypond-version).stamp:
- mkdir -p $(dir $@)
- echo $< -t -p$(root)
- touch $@
-$(target-root)/etc/autopackage/lilypond-$(lilypond-version)-upgrade.stamp:
- mkdir -p $(dir $@)
- echo $< -t -p$(root)
- touch $@
-
-lilypond-upgrade:
$(upload-dir)/lilypond-$(lilypond-version)-upgrade.$(ARCH).package
Index: installers/linux/autopackage/skeletons/@gnu.org/guile/skeleton.1
diff -u installers/linux/autopackage/skeletons/@gnu.org/guile/skeleton.1:1.1
installers/linux/autopackage/skeletons/@gnu.org/guile/skeleton.1:1.2
--- installers/linux/autopackage/skeletons/@gnu.org/guile/skeleton.1:1.1
Mon Aug 22 23:12:58 2005
+++ installers/linux/autopackage/skeletons/@gnu.org/guile/skeleton.1 Mon Aug
29 11:47:57 2005
@@ -12,11 +12,11 @@
[Test]
# libguile.so interface test
-#testForLib libguile.so.12 && INTERFACE_VERSIONS=" 12"
-guile1versions=`testForLib -v libguile.so.12`
+#testForLib libguile.so.16 && INTERFACE_VERSIONS=" 16"
+guile1versions=`testForLib -v libguile.so.16`
for v in $guile1versions; do
minor=$( IFS=.; v=( $v ); echo ${v[1]} )
- INTERFACE_VERSIONS="12.$minor $INTERFACE_VERSIONS"
+ INTERFACE_VERSIONS="16.$minor $INTERFACE_VERSIONS"
done
# FIXME: locateCommand foo --version does not work.
@@ -33,5 +33,6 @@
fi
# 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
+##INTERFACE_VERSIONS=$SOFTWARE_VERSIONS
+##INTERFACE_VERSIONS=$SOFTWARE_VERSIONS
trace "guile: we set IFV to $INTERFACE_VERSIONS"
Index: installers/linux/autopackage/specs/glib/default.apspec.in
diff -u installers/linux/autopackage/specs/glib/default.apspec.in:1.4
installers/linux/autopackage/specs/glib/default.apspec.in:1.5
--- installers/linux/autopackage/specs/glib/default.apspec.in:1.4 Mon Aug
22 23:12:58 2005
+++ installers/linux/autopackage/specs/glib/default.apspec.in Mon Aug 29
11:47:57 2005
@@ -19,6 +19,7 @@
## apgcc cannot link with libtool
## prepareBuild --disable-static --enable-shared
+./configure --disable-static --enable-shared
if [[ "$APKG_BUILD_SKIP_MAKE" != "1" ]]; then
# apgcc cannot link modules, but is potentially better for and old glibc
make CC=apgcc CCLD=apgcc || :
Index: installers/linux/autopackage/specs/guile/default.apspec.in
diff -u installers/linux/autopackage/specs/guile/default.apspec.in:1.1
installers/linux/autopackage/specs/guile/default.apspec.in:1.2
--- installers/linux/autopackage/specs/guile/default.apspec.in:1.1 Mon Aug
22 23:12:58 2005
+++ installers/linux/autopackage/specs/guile/default.apspec.in Mon Aug 29
11:47:57 2005
@@ -1,7 +1,7 @@
[Meta]
RootName: @gnu.org/guile:$SOFTWAREVERSION
-##SoftwareVersion: @[EMAIL PROTECTED]
-SoftwareVersion: @GUILE_VERSION@
+SoftwareVersion: @[EMAIL PROTECTED]
+##SoftwareVersion: @GUILE_VERSION@
ShortName: guile
DisplayName: guile
Summary: The GNU extension language and Scheme interpreter
@@ -12,7 +12,8 @@
## So, we use software version for interface version
## InterfaceVersion: @GUILE_VERSION@
## that doesn't work, we need A.B
-InterfaceVersion: 1.67
+##InterfaceVersion: 1.67
+InterfaceVersion: 16.0
PackageVersion: 0
AutopackageTarget: 1.0
@@ -24,7 +25,21 @@
other applications via libguile.
[BuildPrepare]
-prepareBuild --disable-static --enable-shared --without-threads
--enable-relocation
+##prepareBuild --disable-static --enable-shared --without-threads
--enable-relocation
+
+##./configure --disable-static --enable-shared --without-threads
--enable-relocation
+./configure --disable-static --enable-shared --enable-relocation
+if [[ "$APKG_BUILD_SKIP_MAKE" != "1" ]]; then
+ # apgcc cannot link modules, but is potentially better for and old glibc
+ make CC=apgcc CCLD=apgcc || :
+ make CC=gcc CCLD=gcc || :
+ make CC=gcc CCLD=gcc || exit 1
+fi
+
+make install DESTDIR=$build_root || exit 1
+mv $build_root/usr/local/* $build_root
+
+
## FIXME: -doc package
rm -rf $buibld_root/usr
@@ -39,6 +54,7 @@
##rm -rf include
##rm -rf lib/pkgconfig
## FIXME: -doc package
+rm -f share/guile/*/guile-proceduces.txt
rm -rf info
rm -rf man
rm -rf share/doc
@@ -71,7 +87,10 @@
cat > "$PREFIX/bin/guile-config" <<EOS
[ "\$1" == "--version" ] && echo "guile-config - Guile version
$SOFTWAREVERSION"
[ "\$1" == "compile" ] && echo "-I$PREFIX/include"
- [ "\$1" == "link" ] && echo "-L$PREFIX/lib -lguile -lgmp"
+## 1.6
+## [ "\$1" == "link" ] && echo "-L$PREFIX/lib -lguile -lgmp"
+## 1.7, threads
+ [ "\$1" == "link" ] && echo "-L$PREFIX/lib -pthread -lguile -lltdl -lgmp
-lcrypt -lm"
exit 0
EOS
chmod 755 "$PREFIX/bin/guile-config"
Index: installers/linux/autopackage/specs/lilypond/default.apspec.in
diff -u installers/linux/autopackage/specs/lilypond/default.apspec.in:1.20
installers/linux/autopackage/specs/lilypond/default.apspec.in:1.21
--- installers/linux/autopackage/specs/lilypond/default.apspec.in:1.20 Mon Aug
22 23:12:58 2005
+++ installers/linux/autopackage/specs/lilypond/default.apspec.in Mon Aug
29 11:47:57 2005
@@ -34,6 +34,8 @@
#export programs
[BuildPrepare]
+export CC=gcc
+export CXX=g++
prepareBuild --prefix=/usr --without-kpathsea --enable-relocation
--enable-static-gxx
#if [[ "$APKG_BUILD_SKIP_MAKE" != "1" ]]; then
@@ -91,7 +93,8 @@
require @gtk.org/pango 1
## we need 1.6.7, NOT 1.6.4. Both have interface 12.3
## require @gnu.org/guile 12.3
-require @gnu.org/guile 1.67
+##require @gnu.org/guile 1.67
+require @gnu.org/guile 16.0
#requireAtLeast does not find/install the bundeled package.
#requireAtLeast @artifex.com/ghostscript:8.15
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
