CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch: lilypond_2_4
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/04/25 16:02:14
Modified files:
cygwin : mknetrel.split mknetrel.cross mknetrel
lilypond.hint
Log message:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/cygwin/mknetrel.split.diff?only_with_tag=lilypond_2_4&tr1=1.5&tr2=1.5.2.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/cygwin/mknetrel.cross.diff?only_with_tag=lilypond_2_4&tr1=1.3&tr2=1.3.2.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/cygwin/mknetrel.diff?only_with_tag=lilypond_2_4&tr1=1.35.2.1&tr2=1.35.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/cygwin/lilypond.hint.diff?only_with_tag=lilypond_2_4&tr1=1.17&tr2=1.17.2.1&r1=text&r2=text
Patches:
Index: lilypond/cygwin/lilypond.hint
diff -u /dev/null lilypond/cygwin/lilypond.hint:1.17.2.1
--- /dev/null Mon Apr 25 16:02:15 2005
+++ lilypond/cygwin/lilypond.hint Mon Apr 25 16:02:14 2005
@@ -0,0 +1,9 @@
+sdesc: "A program for printing sheet music"
+category: Publishing
+requires: bash coreutils cygwin ec-fonts-mftraced findutils ghostscript
libguile12 libiconv2 libintl2 libkpathsea3 libkpathsea4 python tetex-bin
tetex-tiny _update-info-dir
+#requires: tetex-bin, tetex-tiny | tetex-base
+#suggests: emacs gsview lilypond-doc rxvt tetex-x11 xorg-x11-base
+ldesc: "A program for printing sheet music.
+LilyPond prints beautiful sheet music. It produces music notation
+from a description file. It excels at typesetting classical music, but
+you can also print pop-songs. LilyPond is part of the GNU Project."
Index: lilypond/cygwin/mknetrel
diff -u lilypond/cygwin/mknetrel:1.35.2.1 lilypond/cygwin/mknetrel:1.35.2.2
--- lilypond/cygwin/mknetrel:1.35.2.1 Wed Feb 9 16:26:35 2005
+++ lilypond/cygwin/mknetrel Mon Apr 25 16:02:14 2005
@@ -86,18 +86,28 @@
patchsrc
rm -f config.cache
+ cd $src
+ if [ ! -x ./configure ]; then
+ ./autogen.sh --noconfigure
+ fi
+
+ cd $build
# for cross-compiling LilyPond, fake a guile-config
if ! iscygwin; then
cd $build || exit 1
GUILE=1.6.5
- cat > guile-config <<EOF
-[ "\$1" == "--version" ] && echo "guile-config - Guile version $GUILE"
+ cat > i686-cygwin-guile-config <<EOF
+[ "\$1" == "--version" ] && echo "i686-cygwin-guile-config - Guile version
$GUILE"
[ "\$1" == "compile" ] && echo "-I$cygwin_root/usr/include"
[ "\$1" == "link" ] && echo "-L$cygwin_root/usr/lib -lguile"
exit 0
EOF
- chmod 755 guile-config
+ chmod 755 i686-cygwin-guile-config
PATH=$(pwd):$PATH
+ export PKG_CONFIG_PATH=$cygwin_root/usr/lib/pkgconfig
+ export PKG_CONFIG="pkg-config \
+--define-variable prefix=$cygwin_root \
+--define-variable includedir=$cygwin_root/usr/include"
fi
}
@@ -107,13 +117,17 @@
# cross-compiling: configure for build-host
if ! iscygwin; then
rm -f config.cache
- export HOST_CC=gcc
- export HOST_CXX=g++
+ export HOST_CC=${HOST_CC:-gcc}
+ export HOST_CXX=${HOST_CXX:-g++}
+ export HOST_PKG_CONFIG=${HOST_PKG_CONFIG:-pkg-config}
+ export HOST_PKG_CONFIG_PATH=${HOST_PKG_CONFIG_PATH:-}
(PATH="$old_path" \
PATH="$HOME/usr/pkg/guile/bin:$PATH" \
CFLAGS="-O2 -g" \
CC=$HOST_CC \
CXX=$HOST_CXX \
+ PKG_CONFIG=$HOST_PKG_CONFIG \
+ PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH \
$src/configure --prefix=/usr --enable-config=for-build)
fi
}
Index: lilypond/cygwin/mknetrel.cross
diff -u /dev/null lilypond/cygwin/mknetrel.cross:1.3.2.1
--- /dev/null Mon Apr 25 16:02:15 2005
+++ lilypond/cygwin/mknetrel.cross Mon Apr 25 16:02:14 2005
@@ -0,0 +1,64 @@
+# -*- shell-script -*-
+
+#
+# mknetrel.cross -- set cross.cache for configure
+#
+
+crosscache () {
+ cat <<EOF > config.cache
+ac_cv_c_bigendian=\${ac_cv_c_bigendian=no}
+ac_cv_c_long_size_t=\${ac_cv_c_long_size_t=no}
+ac_cv_c_long_time_t=\${ac_cv_c_long_time_t=yes}
+ac_cv_sizeof___int64=\${ac_cv_sizeof___int64=0}
+ac_cv_sizeof_char=\${ac_cv_sizeof_char=1}
+ac_cv_sizeof_char_p=\${ac_cv_sizeof_char_p=4}
+ac_cv_sizeof_double=\${ac_cv_sizeof_double=8}
+ac_cv_sizeof_float=\${ac_cv_sizeof_float=4}
+ac_cv_sizeof_int=\${ac_cv_sizeof_int=4}
+ac_cv_sizeof_intmax_t=\${ac_cv_sizeof_intmax_t=8}
+ac_cv_sizeof_intptr_t=\${ac_cv_sizeof_intptr_t=4}
+ac_cv_sizeof_long=\${ac_cv_sizeof_long=4}
+ac_cv_sizeof_long_double=\${ac_cv_sizeof_long_double=12}
+ac_cv_sizeof_long_long=\${ac_cv_sizeof_long_long=8}
+ac_cv_sizeof_ptrdiff_t=\${ac_cv_sizeof_ptrdiff_t=4}
+ac_cv_sizeof_short=\${ac_cv_sizeof_short=2}
+ac_cv_sizeof_size_t=\${ac_cv_sizeof_size_t=4}
+ac_cv_sizeof_uintptr_t=\${ac_cv_sizeof_uintptr_t=4}
+ac_cv_sizeof_unsigned___int64=\${ac_cv_sizeof_unsigned___int64=0}
+ac_cv_sizeof_unsigned_char=\${ac_cv_sizeof_unsigned_char=1}
+ac_cv_sizeof_unsigned_int=\${ac_cv_sizeof_unsigned_int=4}
+ac_cv_sizeof_unsigned_long=\${ac_cv_sizeof_unsigned_long=4}
+ac_cv_sizeof_unsigned_long_long=\${ac_cv_sizeof_unsigned_long_long=8}
+ac_cv_sizeof_unsigned_short=\${ac_cv_sizeof_unsigned_short=2}
+ac_cv_sizeof_void_p=\${ac_cv_sizeof_void_p=4}
+ac_16bit_type=\${ac_16bit_type=short}
+ac_32bit_type=\${ac_32bit_type=int}
+ac_64bit_type=\${ac_64bit_type=none}
+ac_cv_sys_restartable_syscalls=\${ac_cv_sys_restartable_syscalls=yes}
+ac_cv_sprintf_count=\${ac_cv_sprintf_count=yes}
+ac_cv_spinlocks=\${ac_cv_spinlocks=no}
+ac_cv_func_getpgrp_void=\${ac_cv_func_getpgrp_void=yes}
+ac_cv_func_setvbuf_reversed=\${ac_cv_func_setvbuf_reversed=no}
+ac_cv_func_mkfifo=yes
+ac_cv_search_dlopen=\${ac_cv_search_dlopen="none required"}
+ac_exeext=\${ac_exeext=}
+ac_cv_exeext=\${ac_cv_exeext=}
+
+# libtool searches not only in the cross libpath
+# /cygwin/usr/lib:/cygwin/usr/lib/w32api:/usr/i686-cygwin/lib
+# but also in /usr/lib. there it finds libdl.a and adds -ldl
+# to LIBS
+# it seems that libtool is broken wrt cross compilation:
+# sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+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"'"}
+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}
+ac_cv_lib_dl_dlopen=\${ac_cv_lib_dl_dlopen=no}
+EOF
+}
+
Index: lilypond/cygwin/mknetrel.split
diff -u /dev/null lilypond/cygwin/mknetrel.split:1.5.2.1
--- /dev/null Mon Apr 25 16:02:15 2005
+++ lilypond/cygwin/mknetrel.split Mon Apr 25 16:02:14 2005
@@ -0,0 +1,134 @@
+# -*- shell-script -*-
+
+#
+# mknetrel.split -- split subpackages
+#
+
+presplit () { true; }
+
+lib_name () {
+ echo lib$base$sover
+}
+
+devel_name () {
+ echo $base-devel
+}
+
+doc_name () {
+ echo $base-doc
+}
+
+lib_split () {
+ mkdir -p ./$prefix/bin || exit 1
+ mv $inst/$prefix/bin/*.dll ./$prefix/bin
+ # 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
+ mv $inst/$prefix/share/$base ./$prefix/share
+ rmdir $inst/prefix/bin || true
+ rmdir $inst/prefix/lib || true
+ rmdir $inst/prefix/share || true
+ true
+}
+
+devel_split () {
+ mkdir -p ./$prefix/bin || exit 1
+ tar -C $inst -cf - ./$prefix/include | tar -xf -
+ rm -rf $inst/$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
+ mkdir -p ./$prefix/share || exit 1
+ tar -C $inst -cf - ./$prefix/share/aclocal | tar -xf -
+ rm -rf $inst/$prefix/share/aclocal
+ rmdir $inst/prefix/lib || true
+ rmdir $inst/prefix/share || true
+ true
+}
+
+doc_split () {
+ mkdir -p ./$docprefix || exit 1
+ mkdir -p ./$infodir || exit 1
+ tar -C $inst -cf - ./$infodir | tar -xf -
+ rm -rf $inst/$infodir
+ true
+}
+
+prebuild () {
+ for i in $sub_packages; do
+ rm -rf $inst-$i
+ mkdir -p $inst-$i || exit 1
+ done
+}
+
+domkdist() {
+ #
+ # Fix up installation slightly
+ #
+ cd $inst || exit 1
+ chmod -R u+w,og-w,a+rX .
+ cd usr 2>/dev/null && dousrstuff
+
+ # Split off any sub-packages. The actual splitting is handled by
+ # a package's specific code in extra/.
+
+ # To package `foo' in foo, foo-doc and foo-devel, set
+ # sub_packages='doc devel'.
+
+ # Then provide functions doc_name and devel_name, that return the
+ # full name of the sub-package. Also provide functions doc_split
+ # and devel_split, that mv part of foo's installation in $inst to
+ # the sub-packages' installation roots $inst-doc and $inst-devel.
+
+ cd $inst || exit 1
+ presplit
+
+ for i in $sub_packages; do
+ subname=$(${i}_name)
+ cd $inst-$i || exit 1
+ ${i}_split || exit 1
+ done
+
+ cd $inst || exit 1
+ prepackage
+
+ cd $inst || exit 1
+ hard2soft
+
+ #
+ # Make tar balls
+ #
+
+ # The base package
+ echo creating $tarstem.tar.bz2
+ cd $inst || exit 1
+
+ f=$src/cygwin/setup.hint && test -r $f && cp $f $uploads
+ f=$src/cygwin/$base.hint && test -r $f && cp $f $uploads/setup.hint
+ find * -print | sort | tar -T - --no-recursion --owner=0 --group=0 -cjf
$tarstem.tar.bz2
+
+ # Any sub-packages
+ for i in $sub_packages; do
+ subname=$(${i}_name)
+ subload=$uploads/$subname
+ subtarstem=$subload/$subname-$ver
+ mkdir -p $subload || exit 1
+ echo creating $subtarstem.tar.bz2
+ f=$src/cygwin/$subname.hint && test -r $f && cp $f $subload/setup.hint
+ cd $inst-$i
+ hard2soft
+ find * -print | sort | tar -T - --no-recursion --owner=0 --group=0 -cjf
$subtarstem.tar.bz2
+ done
+
+ # The source package
+ cd $src/.. || exit 1
+ echo creating "$tarstem"-src.tar.bz2
+ ##find $package_src/* -print -follow | egrep -v
'\.cvsignore|\.bak$|\.orig$|\.o$|~$|^.#|CVS|%redact|/tags$' | egrep -v
"$src_exclude" | sort | tar -T - --no-recursion --owner=0 --group=0 -cjf
"$tarstem"-src.tar.bz2
+ cd $package_src && tar -cj --exclude='\.cvsignore' --exclude='\.bak$'
--exclude='\.orig$' --exclude='\.o$' --exclude='~$' --exclude='^.#'
--exclude='CVS' --exclude='%redact' --exclude='/tags$' --owner=0 --group=0 -f
"$tarstem"-src.tar.bz2 .
+ postpackage
+}
+
+
+
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
