From: janneke <janneke>
Date: Tue, 12 Oct 2004 21:40:03 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.3.24^2~46
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=72d0a88a001f42d9f000eb8a5a4d6613d4472b61;p=lilypond.git

*** empty log message ***
---

diff --git a/cygwin/changelog b/cygwin/changelog
index f400bbeeba..94234c1d71 100644
--- a/cygwin/changelog
+++ b/cygwin/changelog
@@ -1,3 +1,9 @@
+lilypond (2.3.22-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jan Nieuwenhuizen <janneke@gnu.org>  Tue, 12 Oct 2004 14:00:15 +0200
+
 lilypond (2.3.20-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/cygwin/lilypond.hint b/cygwin/lilypond.hint
index fe451e6709..49dc7a5ec9 100644
--- a/cygwin/lilypond.hint
+++ b/cygwin/lilypond.hint
@@ -1,6 +1,6 @@
 sdesc: "A program for printing sheet music"
 category: Publishing
-requires: bash cygwin fileutils findutils ghostscript libguile16 libiconv2 libintl2 libkpathsea3 python tetex-bin tetex-tiny _update-info-dir
+requires: bash cygwin fileutils findutils ghostscript libguile16 libguile12 libiconv2 libintl2 libkpathsea3 python tetex-bin tetex-tiny _update-info-dir
 #requires: tetex-bin, tetex-tiny | tetex-base
 #suggests: emacs gsview lilypond-doc rxvt tetex-x11 XFree86-serv
 ldesc: "A program for printing sheet music.
diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index ffe043dec4..67cda899dd 100644
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -43,7 +43,42 @@ done
 
 
 needdevoflags () {
-    return 1
+    false
+}
+
+fix_libtool_script () {
+    cd $build || exit 1
+
+    # Fix libtool's -rpath detection
+    export CC="${build_cc}"
+    export CXX="${build_cxx}"
+    export DLLTOOL=${build_dlltool}
+    export OBJDUMP=${build_objdump}
+    export AS="${build_as}"
+    export HOST_CC=/usr/bin/gcc
+    export allow_undefined="yes"
+    export allow_undefined_flag=""
+    
+    # fix libtool's dlltool usage
+    mv libtool libtool.orig
+    sed -e 's/^DLLTOOL="dlltool"/DLLTOOL="i686-cygwin-dlltool"/' \
+        -e 's/^DLLTOOL=/HOST_CC=gcc\nDLLTOOL=/' \
+        -e 's/^HOST_CC=/SED=sed\nHOST_CC=/' < libtool.orig > libtool
+    chmod +x libtool
+}
+
+fix_libtool_la () {
+    # fix libtool's .la dependency_libs output for dlopen
+    for i in $inst/lib $inst/$prefix/lib ]; do
+	if [ -d $i ]; then
+	    cd $i || exit 1
+	    for j in $(ls -1 *la); do
+		mv $j .libtool-$j
+		sed -e 's/ *-L *[^ ][^ ]*//g' .libtool-$j > $j
+		chmod +x $j
+	    done
+	fi
+    done
 }
 
 preconfig () {
@@ -67,13 +102,15 @@ EOF
 }
 
 postconfig () {
+    # fix_libtool_script
+
     # cross-compiling: configure for build-host
     if ! iscygwin; then
 	rm -f config.cache
 	export HOST_CC=gcc
 	export HOST_CXX=g++
 	(PATH="$old_path" \
-	    PATH="$HOME/usr/pkg/guile-1.6/bin:$PATH" \
+	    PATH="$HOME/usr/pkg/guile/bin:$PATH" \
 	    CFLAGS="-O2 -g" \
 	    CC=$HOST_CC \
 	    CXX=$HOST_CXX \
@@ -127,6 +164,7 @@ preinstall () {
 
 postinstall () {
     fixdoc
+    fix_libtool_la
     
     mkdir -p $inst-doc/$docprefix
     cd $build || exit 1
diff --git a/cygwin/mknetrel.split b/cygwin/mknetrel.split
index 1506b3d9f2..f9361cd323 100644
--- a/cygwin/mknetrel.split
+++ b/cygwin/mknetrel.split
@@ -21,7 +21,7 @@ doc_name () {
 lib_split () {
     mkdir -p ./$prefix/bin || exit 1
     mv $inst/$prefix/bin/*.dll ./$prefix/bin
-    # dlopen-able .la files go in BIN dir, lib package
+    # dlopen-able .la files go in BIN dir, BIN OR LIB package
     mkdir -p ./$prefix/bin || exit 1
     mv $inst/$prefix/lib/lib*[0-9]*.la ./$prefix/bin
     mkdir -p ./$prefix/share || exit 1
@@ -32,11 +32,10 @@ lib_split () {
 devel_split () {
     mkdir -p ./$prefix/bin || exit 1
     mv $inst/$prefix/include ./$prefix/include
+    # Only static .a libs in devel, load time .la files go in LIB or
+    # BIN package.
     mkdir -p ./$prefix/lib || exit 1
     mv $inst/$prefix/lib/*.a ./$prefix/lib
-    # link time .la files go in LIB dir devel package
-    mkdir -p ./$prefix/lib || exit 1
-    mv $inst/$prefix/lib/*.la ./$prefix/lib
     mkdir -p ./$prefix/share || exit 1
     mv $inst/$prefix/share/aclocal ./$prefix/share
     true