CVSROOT: /cvsroot/lilypond
Module name: installers
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/10/10 18:36:56
Modified files:
windows/mknetrel: cross
windows/extra : guile
windows/bin : cyg-apt
windows : ChangeLog
Log message:
(download): Remove cached file on md5 clash.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/mknetrel/cross.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/extra/guile.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/bin/cyg-apt.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/ChangeLog.diff?tr1=1.41&tr2=1.42&r1=text&r2=text
Patches:
Index: installers/windows/ChangeLog
diff -u installers/windows/ChangeLog:1.41 installers/windows/ChangeLog:1.42
--- installers/windows/ChangeLog:1.41 Fri Oct 7 13:34:59 2005
+++ installers/windows/ChangeLog Mon Oct 10 18:36:56 2005
@@ -1,3 +1,12 @@
+2005-10-10 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * bin/cyg-apt (download): Remove cached file on md5 clash.
+
+2005-10-08 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * extra/guile: Do not move dlopen-ed .la files in /usr/bin for
+ guile-1.7. This has been fixed in cygwin-1.5.18, libtool-1.5.20.
+
2005-10-07 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* mknetrel/split (auto_requires): Add auto-requires detection for
Index: installers/windows/bin/cyg-apt
diff -u installers/windows/bin/cyg-apt:1.11 installers/windows/bin/cyg-apt:1.12
--- installers/windows/bin/cyg-apt:1.11 Sun Jul 24 08:26:11 2005
+++ installers/windows/bin/cyg-apt Mon Oct 10 18:36:55 2005
@@ -351,6 +351,8 @@
url, md5 = get_url ()
dir = '%s/%s' % (downloads, os.path.split (url)[0])
if not os.path.exists (get_ball ()) or not check_md5 ():
+ if os.path.exists (get_ball ()):
+ os.remove (get_ball ())
if not os.path.exists (dir):
os.makedirs (dir)
# urllib
Index: installers/windows/extra/guile
diff -u installers/windows/extra/guile:1.11 installers/windows/extra/guile:1.12
--- installers/windows/extra/guile:1.11 Sun Oct 2 15:26:13 2005
+++ installers/windows/extra/guile Mon Oct 10 18:36:55 2005
@@ -101,6 +101,9 @@
iscygwin || if [ "$cygwin" == "cygwin" -a "$sover" == "16" ]; then
cp $extra/libguilereadline-v-16.la $build/guile-readline
cp $extra/libguile-srfi-srfi-60-v-1.la $build/srfi
+ install -d $inst/$prefix/bin
+ install -m 755 guile-readline/.libs/cygguilereadline-v-16-16.dll
$inst/$prefix/bin
+ install -m 755 srfi/.libs/cygguile-srfi-srfi-60-v-1-1.dll
$inst/$prefix/bin
fi
}
@@ -115,11 +118,13 @@
mv $inst/$prefix/bin/guile-* $inst-devel/$prefix/bin
}
-lib_split () {
- ## GUILE only
- ## 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
-
+## fixed in libtool-1.5.20
+xxxlib_split () {
+ if [ "$cygwin" == "cygwin" -a "$sover" == "12" ]; then
+ ## GUILE-1.6 only
+ ## 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
+ fi
extras_lib_split
}
Index: installers/windows/mknetrel/cross
diff -u installers/windows/mknetrel/cross:1.2
installers/windows/mknetrel/cross:1.3
--- installers/windows/mknetrel/cross:1.2 Thu May 19 21:32:59 2005
+++ installers/windows/mknetrel/cross Mon Oct 10 18:36:55 2005
@@ -61,9 +61,7 @@
lt_cv_dlopen=\${lt_cv_dlopen="dlopen"}
lt_cv_dlopen_libs=\${lt_cv_dlopen_libs="none required"}
## trying to get .la's in /usr/lib, will this work? -- jcn
-##libltdl_cv_sys_search_path=\${libltdl_cv_sys_search_path="'"/lib /usr/lib"'"}
-##libltdl_cv_sys_search_path=\${libltdl_cv_sys_search_path="'"$cygwin_prefix/lib"'"}
-libltdl_cv_sys_search_path=\${libltdl_cv_sys_search_path="'"$cygwin_prefix/lib"'"}
+libltdl_cv_sys_search_path=\${libltdl_cv_sys_search_path="'"/lib /usr/lib
$cygwin_prefix/lib"'"}
lt_cv_sys_max_cmd_len=\${lt_cv_sys_max_cmd_len=8192}
##ac_cv_header_strings_h=\${ac_cv_header_strings_h=yes}
ac_cv_lib_dld_shl_load=\${ac_cv_lib_dld_shl_load=no}
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
