CVSROOT: /cvsroot/lilypond
Module name: installers
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/08/20 08:19:59
Modified files:
linux/autopackage/specs/lilypond: default.apspec.in
linux/autopackage/specs/glib: default.apspec.in
linux/autopackage: README GNUmakefile ChangeLog
Log message:
* specs/lilypond/default.apspec.in (AutopackageTarget):
--enable-static-gxx.
* specs/glib/default.apspec.in (AutopackageTarget): Link using gcc
iso apgcc; apgcc cannot link pango or glib.
* GNUmakefile (autopackage-version): Upgrade to 1.0.6. See
README.
(default): Revert --enable-static-gxx from dummy configure.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/specs/lilypond/default.apspec.in.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/specs/glib/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/README.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.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/ChangeLog.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
Patches:
Index: installers/linux/autopackage/ChangeLog
diff -u installers/linux/autopackage/ChangeLog:1.17
installers/linux/autopackage/ChangeLog:1.18
--- installers/linux/autopackage/ChangeLog:1.17 Tue Jul 19 12:51:24 2005
+++ installers/linux/autopackage/ChangeLog Sat Aug 20 08:19:59 2005
@@ -1,3 +1,15 @@
+2005-08-20 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * specs/lilypond/default.apspec.in (AutopackageTarget):
+ --enable-static-gxx.
+
+ * specs/glib/default.apspec.in (AutopackageTarget): Link using gcc
+ iso apgcc; apgcc cannot link pango or glib.
+
+ * GNUmakefile (autopackage-version): Upgrade to 1.0.6. See
+ README.
+ (default): Revert --enable-static-gxx from dummy configure.
+
2005-07-19 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* GNUmakefile
Index: installers/linux/autopackage/GNUmakefile
diff -u installers/linux/autopackage/GNUmakefile:1.15
installers/linux/autopackage/GNUmakefile:1.16
--- installers/linux/autopackage/GNUmakefile:1.15 Sun Aug 14 07:49:59 2005
+++ installers/linux/autopackage/GNUmakefile Sat Aug 20 08:19:59 2005
@@ -6,7 +6,7 @@
# /usr, clobbering system packages.
# 1.0.4 is broken: it does not make sealed packages -- only if 1.0.2 leftovers
# are installed. Be sure to remove all traces of previous installs.
-autopackage-version = 1.0.4
+autopackage-version = 1.0.6
pango-version = 1.8.1
glib-version = 2.6.4
@@ -151,7 +151,7 @@
uploads/lilypond-$(lilypond-version).$(ARCH).package:
src/lilypond-$(lilypond-version)/autopackage/default.apspec.in
src/lilypond-$(lilypond-version)/autopackage/packages/.stamp
#touch src/lilypond-$(lilypond-version)/config.status
#touch src/lilypond-$(lilypond-version)/autopackage/default.apspec
- test -e src/lilypond-$(lilypond-version)/config.status || (cd
src/lilypond-$(lilypond-version) && ./configure --enable-static-gxx)
+ test -e src/lilypond-$(lilypond-version)/config.status || (cd
src/lilypond-$(lilypond-version) && ./configure)
cp -pv $(autopackage-support)
src/lilypond-$(lilypond-version)/autopackage/packages
cp -pv $(autopackage-gtk-support)
src/lilypond-$(lilypond-version)/autopackage/packages
cd src/lilypond-$(lilypond-version) && makeinstaller
$(MAKEINSTALLER_FLAGS)
@@ -160,6 +160,6 @@
uploads/lilypond-$(lilypond-version)-upgrade.$(ARCH).package: lilypond
src/lilypond-$(lilypond-version)/autopackage/default.apspec.in
src/lilypond-$(lilypond-version)/autopackage/packages/.upgrade-stamp
#touch src/lilypond-$(lilypond-version)/config.status
#touch src/lilypond-$(lilypond-version)/autopackage/default.apspec
- test -e src/lilypond-$(lilypond-version)/config.status || (cd
src/lilypond-$(lilypond-version) && ./configure --enable-static-gxx)
+ test -e src/lilypond-$(lilypond-version)/config.status || (cd
src/lilypond-$(lilypond-version) && ./configure)
cd src/lilypond-$(lilypond-version) && makeinstaller
$(MAKEINSTALLER_FLAGS) -mc
mv
src/lilypond-$(lilypond-version)/lilypond-$(lilypond-version).$(ARCH).package $@
Index: installers/linux/autopackage/README
diff -u installers/linux/autopackage/README:1.2
installers/linux/autopackage/README:1.3
--- installers/linux/autopackage/README:1.2 Wed Jun 29 11:53:30 2005
+++ installers/linux/autopackage/README Sat Aug 20 08:19:59 2005
@@ -3,8 +3,8 @@
* install autopackage-devel
- wget
http://ftp.sunsite.dk/projects/autopackage/1.0.3/autopackage-devel-1.0.3.x86.package
- ./autopackage-devel-1.0.3.x86.package
+ wget
http://ftp.sunsite.dk/projects/autopackage/1.0.6/autopackage-devel-1.0.6.x86.package
+ ./autopackage-devel-1.0.6.x86.package
* add our skeletons, do something like
Index: installers/linux/autopackage/specs/glib/default.apspec.in
diff -u installers/linux/autopackage/specs/glib/default.apspec.in:1.2
installers/linux/autopackage/specs/glib/default.apspec.in:1.3
--- installers/linux/autopackage/specs/glib/default.apspec.in:1.2 Tue Jun
7 14:53:08 2005
+++ installers/linux/autopackage/specs/glib/default.apspec.in Sat Aug 20
08:19:59 2005
@@ -16,7 +16,23 @@
C library used by projects such as GTK+, GIMP, and GNOME.
[BuildPrepare]
-prepareBuild --disable-static --enable-shared
+## apgcc cannot link with libtool
+## prepareBuild --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 || :
+ make CC=gcc CCLD=gcc || :
+ make CC=gcc CCLD=gcc || exit 1
+fi
+
+#libtool: install: error: cannot install `libpangoft2-1.0.la' to a directory
not ending in /usr/local/lib
+#make install DESTDIR=$build_root prefix= || exit 1
+make install DESTDIR=$build_root || exit 1
+mv $build_root/usr/local/* $build_root
+rm -rf $build_root/usr
+rm -rf $build_root/man
+rm -rf $build_root/share
[BuildUnprepare]
unprepareBuild
Index: installers/linux/autopackage/specs/lilypond/default.apspec.in
diff -u installers/linux/autopackage/specs/lilypond/default.apspec.in:1.18
installers/linux/autopackage/specs/lilypond/default.apspec.in:1.19
--- installers/linux/autopackage/specs/lilypond/default.apspec.in:1.18 Sun Aug
14 07:49:59 2005
+++ installers/linux/autopackage/specs/lilypond/default.apspec.in Sat Aug
20 08:19:57 2005
@@ -34,7 +34,7 @@
#export programs
[BuildPrepare]
-prepareBuild --prefix=/usr --without-kpathsea --enable-relocation
+prepareBuild --prefix=/usr --without-kpathsea --enable-relocation
--enable-static-gxx
#if [[ "$APKG_BUILD_SKIP_MAKE" != "1" ]]; then
make -C autopackage all;
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
