CVSROOT: /cvsroot/lilypond
Module name: installers
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/08/29 22:41:46
Modified files:
linux/autopackage/specs/lilypond: default.apspec.in
linux/autopackage/specs/guile: default.apspec.in
linux/autopackage/skeletons/@gnu.org/guile: skeleton.1
linux/autopackage: GNUmakefile ChangeLog
Log message:
revert to guile 1.6.7
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/specs/lilypond/default.apspec.in.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/specs/guile/default.apspec.in.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/skeletons/@gnu.org/guile/skeleton.1.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/GNUmakefile.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/ChangeLog.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
Patches:
Index: installers/linux/autopackage/ChangeLog
diff -u installers/linux/autopackage/ChangeLog:1.22
installers/linux/autopackage/ChangeLog:1.23
--- installers/linux/autopackage/ChangeLog:1.22 Mon Aug 29 11:47:57 2005
+++ installers/linux/autopackage/ChangeLog Mon Aug 29 22:41:46 2005
@@ -1,9 +1,15 @@
2005-08-29 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+ * GNUmakefile: disable libpng, the version warning is a warning
+ only.
+
+ * Revert to guile-1.6.7.reloc.
+
* 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]>
Index: installers/linux/autopackage/GNUmakefile
diff -u installers/linux/autopackage/GNUmakefile:1.20
installers/linux/autopackage/GNUmakefile:1.21
--- installers/linux/autopackage/GNUmakefile:1.20 Mon Aug 29 11:47:57 2005
+++ installers/linux/autopackage/GNUmakefile Mon Aug 29 22:41:46 2005
@@ -24,13 +24,12 @@
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.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.6:$(GUILE_LOAD_PATH)
export PATH
export LD_LIBRARY_PATH
export PKG_CONFIG_PATH
@@ -56,6 +55,8 @@
autopackage-support = downloads/autopackage.tar.bz2
.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)
@@ -90,6 +91,7 @@
touch $@
specs/%/default.apspec.in:
+ rm -f $(shell dirname $@)
ln -s $(shell expr $@ : 'specs/\([^-]*\)') $(shell dirname $@)
src/%/autopackage/default.apspec: specs/%/default.apspec.in
@@ -184,11 +186,11 @@
# PARTLY Explicit dependencies -- for autopackage
$(guile-build): $(gettext-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
lilypond-dependencies = pango ghostscript guile
Index: installers/linux/autopackage/skeletons/@gnu.org/guile/skeleton.1
diff -u installers/linux/autopackage/skeletons/@gnu.org/guile/skeleton.1:1.2
installers/linux/autopackage/skeletons/@gnu.org/guile/skeleton.1:1.3
--- installers/linux/autopackage/skeletons/@gnu.org/guile/skeleton.1:1.2
Mon Aug 29 11:47:57 2005
+++ installers/linux/autopackage/skeletons/@gnu.org/guile/skeleton.1 Mon Aug
29 22:41:46 2005
@@ -12,16 +12,16 @@
[Test]
# libguile.so interface test
-#testForLib libguile.so.16 && INTERFACE_VERSIONS=" 16"
-guile1versions=`testForLib -v libguile.so.16`
+#testForLib libguile.so.12 && INTERFACE_VERSIONS=" 12"
+guile1versions=`testForLib -v libguile.so.12`
for v in $guile1versions; do
minor=$( IFS=.; v=( $v ); echo ${v[1]} )
- INTERFACE_VERSIONS="16.$minor $INTERFACE_VERSIONS"
+ INTERFACE_VERSIONS="12.$minor $INTERFACE_VERSIONS"
done
# FIXME: locateCommand foo --version does not work.
#SOFTWARE_VERSIONS=$(locateCommand guile --version 2>&1)
-SOFTWARE_VERSIONS=$(guile --version 2>&1 | head -1)
+SOFTWARE_VERSIONS=$(guile --version 2>/dev/null | head -1)
if [[ "$?" != "0" ]]; then
SOFTWARE_VERSIONS=""
else
@@ -33,6 +33,5 @@
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/guile/default.apspec.in
diff -u installers/linux/autopackage/specs/guile/default.apspec.in:1.2
installers/linux/autopackage/specs/guile/default.apspec.in:1.3
--- installers/linux/autopackage/specs/guile/default.apspec.in:1.2 Mon Aug
29 11:47:57 2005
+++ installers/linux/autopackage/specs/guile/default.apspec.in Mon Aug 29
22:41:46 2005
@@ -1,7 +1,6 @@
[Meta]
RootName: @gnu.org/guile:$SOFTWAREVERSION
SoftwareVersion: @[EMAIL PROTECTED]
-##SoftwareVersion: @GUILE_VERSION@
ShortName: guile
DisplayName: guile
Summary: The GNU extension language and Scheme interpreter
@@ -12,8 +11,8 @@
## So, we use software version for interface version
## InterfaceVersion: @GUILE_VERSION@
## that doesn't work, we need A.B
-##InterfaceVersion: 1.67
-InterfaceVersion: 16.0
+InterfaceVersion: 1.67
+##InterfaceVersion: 16.0
PackageVersion: 0
AutopackageTarget: 1.0
@@ -25,21 +24,29 @@
other applications via libguile.
[BuildPrepare]
+if false; then
##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
+prepareBuild --disable-static --enable-shared --enable-relocation
+else
+if [[ "$APKG_BUILD_SKIP_CONFIGURE" != "1" ]]; then
+ CC=gcc-3.3 ./configure\
+ --prefix=/usr/local\
+ --disable-static\
+ --enable-shared\
+ --enable-relocation\
+ || exit
+fi
+
if [[ "$APKG_BUILD_SKIP_MAKE" != "1" ]]; then
- # apgcc cannot link modules, but is potentially better for and old glibc
+ # apgcc cannot link, 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
+ make CC=gcc-3.3 CCLD=gcc || exit 1
fi
make install DESTDIR=$build_root || exit 1
mv $build_root/usr/local/* $build_root
-
+fi
## FIXME: -doc package
rm -rf $buibld_root/usr
@@ -87,10 +94,10 @@
cat > "$PREFIX/bin/guile-config" <<EOS
[ "\$1" == "--version" ] && echo "guile-config - Guile version
$SOFTWAREVERSION"
[ "\$1" == "compile" ] && echo "-I$PREFIX/include"
-## 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"
+ ## 1.6
+ [ "\$1" == "link" ] && echo "-L$PREFIX/lib -pthread -lltdl -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.21
installers/linux/autopackage/specs/lilypond/default.apspec.in:1.22
--- installers/linux/autopackage/specs/lilypond/default.apspec.in:1.21 Mon Aug
29 11:47:57 2005
+++ installers/linux/autopackage/specs/lilypond/default.apspec.in Mon Aug
29 22:41:45 2005
@@ -93,8 +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 16.0
+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
