CVSROOT: /cvsroot/lilypond
Module name: installers
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/10/02 15:26:13
Modified files:
windows/mknetrel: split libtool
windows/extra : lilypond guile
windows : GNUmakefile
Log message:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/mknetrel/split.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/mknetrel/libtool.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/extra/lilypond.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/extra/guile.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/GNUmakefile.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
Patches:
Index: installers/windows/GNUmakefile
diff -u installers/windows/GNUmakefile:1.30 installers/windows/GNUmakefile:1.31
--- installers/windows/GNUmakefile:1.30 Sun Aug 14 07:49:59 2005
+++ installers/windows/GNUmakefile Sun Oct 2 15:26:13 2005
@@ -239,6 +239,13 @@
# All packages depend on their installation in target
$(foreach i, $(packages), $(eval $(i): $($(i)-install)))
+# Building a package depends on an unpacked source tree
+$(foreach i, $(packages), $(eval $($(i)-build): $(src-dir)/.$(i)-stamp))
+
+# Installing a package depends on install root
+$(foreach i, $(packages), $(eval $($(i)-install): $(target-root)/.stamp))
+$(foreach i, $(nsis-packages), $(eval $($(i)-install): $(nsis-root)/.stamp))
+
# Explicit dependencies
$(fontconfig-build): $(expat-install) $(freetype-install)
$(freetype-build): $(zlib-install)
@@ -255,9 +262,5 @@
gs-ncsb: $(gs-build)
@echo done
-# Building a package depends on an unpacked source tree
-$(foreach i, $(packages), $(eval $($(i)-build): $(src-dir)/.$(i)-stamp))
-
-# Installing a package depends on install root
-$(foreach i, $(packages), $(eval $($(i)-install): $(target-root)/.stamp))
-$(foreach i, $(nsis-packages), $(eval $($(i)-install): $(nsis-root)/.stamp))
+libguile16:
+ @echo done
Index: installers/windows/extra/guile
diff -u installers/windows/extra/guile:1.10 installers/windows/extra/guile:1.11
--- installers/windows/extra/guile:1.10 Thu Jul 28 22:01:52 2005
+++ installers/windows/extra/guile Sun Oct 2 15:26:13 2005
@@ -34,7 +34,7 @@
# mv libtool fix
# this only for pristine tarball
- # autoupdate
+ autoupdate
# guile-1.6.4 is fine with EXEEXT=.exe. However, now (20030717),
# libtool-CVS needs to be told what AS we're using.
Index: installers/windows/extra/lilypond
diff -u installers/windows/extra/lilypond:1.12
installers/windows/extra/lilypond:1.13
--- installers/windows/extra/lilypond:1.12 Wed Jul 20 21:05:13 2005
+++ installers/windows/extra/lilypond Sun Oct 2 15:26:13 2005
@@ -50,7 +50,7 @@
$src/configure --prefix=$prefix --enable-config=for-build)
fi
- GUILE=$($cygwin_prefix/bin/guile-config --version 2>&1 | awk '{print $NF}')
+ GUILE=$(GUILE_LOAD_PATH=$cygwin_prefix/share/guile/*
$cygwin_prefix/bin/guile-config --version 2>&1 | awk '{print $NF}')
cat > $target-guile-config <<EOF
[ "\$1" == "--version" ] && echo "$target-guile-config - Guile version $GUILE"
[ "\$1" == "compile" ] && echo "-I$cygwin_prefix/include"
Index: installers/windows/mknetrel/libtool
diff -u installers/windows/mknetrel/libtool:1.3
installers/windows/mknetrel/libtool:1.4
--- installers/windows/mknetrel/libtool:1.3 Mon Jul 25 21:35:10 2005
+++ installers/windows/mknetrel/libtool Sun Oct 2 15:26:13 2005
@@ -39,6 +39,7 @@
-e 's/ *-L *[^"'"'"' ][^"'"'"' ]*//g'\
-e "[EMAIL PROTECTED]( \|=\|'\)\(/[^ ]*usr/lib/lib\)\([^
']*\)\.\(a\|la\|so\)[^ '[EMAIL PROTECTED]@g"\
$j
+## -e "[EMAIL PROTECTED]( \|=\|'\)\(cyg\)\([^
']*\)\(\.dll.a\|.a\)[^ '[EMAIL PROTECTED]@g"\
## -e "[EMAIL PROTECTED]( \|=\|'\)\(/usr/lib/lib\)\([^
']*\)\.\(a\|la\|so\)[^ '[EMAIL PROTECTED]@g"\
## -e "[EMAIL PROTECTED](
\|=\|'\)\(/usr/lib/lib\)\([^.]*\)\.\(a\|la\|so\)[^ '[EMAIL PROTECTED]@g"\
## -e "[EMAIL PROTECTED]( \|=\|'\)\(/usr/lib/lib\)\([^.]*\)[^
'[EMAIL PROTECTED]@g"\
@@ -56,7 +57,9 @@
# more libtool fixups. I love libtool.
sed -i~ \
-e "[EMAIL PROTECTED]@dlname='../bin/$dll_prefix$base-$sover.dll'@" \
- -e "[EMAIL PROTECTED]@library_names='$dll_prefix$base.dll.a'@" \
- -e "[EMAIL PROTECTED]@old_library='$dll_prefix$base.a'@" \
+ -e "[EMAIL PROTECTED]@library_names='lib$base.dll.a'@" \
+ -e "[EMAIL PROTECTED]@old_library='lib$base.a'@" \
$inst/$prefix/lib/lib$base.la
+## -e "[EMAIL PROTECTED]@library_names='$dll_prefix$base.dll.a'@" \
+## -e "[EMAIL PROTECTED]@old_library='$dll_prefix$base.a'@" \
}
Index: installers/windows/mknetrel/split
diff -u installers/windows/mknetrel/split:1.7
installers/windows/mknetrel/split:1.8
--- installers/windows/mknetrel/split:1.7 Sun Aug 14 07:49:59 2005
+++ installers/windows/mknetrel/split Sun Oct 2 15:26:13 2005
@@ -129,7 +129,14 @@
EOF
fi
grep ^requires: $hint || echo "requires: $depends" >> $hint
- grep ^build-requires: $hint || echo "build-requires: $build_depends" >>
$hint
+ if [ "$cygwin" == "cygwin" ]; then
+ if grep ^build-requires: $hint; then
+ mv $hint $hint~
+ grep -v build-requires $hint~ > $hint
+ fi
+ else
+ grep ^build-requires: $hint || echo "build-requires: $build_depends" >>
$hint
+ fi
}
domkdist () {
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
