Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 17 years ago
parent
commit
0de4c859d2
4 changed files with 15 additions and 10 deletions
  1. +4
    -4
      package/base/bison/bison.conf
  2. +8
    -3
      package/base/e2fsprogs/e2fsprogs.conf
  3. +1
    -1
      package/base/e2fsprogs/e2fsprogs.desc
  4. +2
    -2
      package/base/flex/flex.conf

+ 4
- 4
package/base/bison/bison.conf

@ -22,12 +22,12 @@
make_yacc() {
echo -e '#!/bin/sh\nbison -y "$@"' > $root/usr/bin/yacc
chmod +x $root/usr/bin/yacc
echo -e '#!/bin/sh\nbison -y "$@"' > $instroot/usr/bin/yacc
chmod +x $instroot/usr/bin/yacc
}
if [ "$stagelevel" -le 1 ]; then
makeopt="datadir=${datadir#$root}"
if [ $stagelevel -le 2 ]; then
makeopt="datadir=${datadir#$instroot}"
premake="sed -i 's, examples , ,' Makefile"
fi

+ 8
- 3
package/base/e2fsprogs/e2fsprogs.conf

@ -23,8 +23,9 @@
libdir="$root/$multilib"
var_append extraconfopt " " '--libdir=$libdir --with-root-prefix=$instroot/'
var_append extraconfopt " " 'enable-fsck --enable-elf-shlibs --disable-evms'
var_append extraconfopt " " '--with-root-prefix=$instroot/'
var_append extraconfopt " " '--enable-fsck --enable-elf-shlibs --disable-evms'
# var_append extraconfopt " " '--with-cc="$CC" --with-linker="$LD"'
if [ "$ROCKCFG_DIETLIBC_e2fsprogs" == "1" ] ; then
var_append extraconfopt " " "--with-diet-libc"
@ -32,10 +33,14 @@ if [ "$ROCKCFG_DIETLIBC_e2fsprogs" == "1" ] ; then
var_append extraconfopt " " "--enable-dynamic-e2fsck"
fi
hook_add premake 3 "chmod -v 0755 configure ; \
cp -v configure{,.orig} ; \
sed -e \"/libdir=.*\/lib/s@/lib@/$multilib@g\" configure.orig > configure"
# if you are brave, try without this and fix it...
LD="$CC"
# somehow "make install" seems not to exectue install-libs, which
# somehow "make install" seems not to execute install-libs, which
# is needed to get the headers installed (and static libraries also)
var_append makeinstopt ' ' "install-libs"
postinstall="install -m 0644 ${confdir}/e2fsck.conf $sysconfdir"

+ 1
- 1
package/base/e2fsprogs/e2fsprogs.desc

@ -39,7 +39,7 @@
[L] GPL LGPL
[S] Stable
[V] 1.40.2
[P] X --2--5---9 101.200
[P] X --X--5---9 101.200
[D] 3814447537 e2fsprogs-1.40.2.tar.gz http://download.sourceforge.net/e2fsprogs/

+ 2
- 2
package/base/flex/flex.conf

@ -22,8 +22,8 @@
pkg_flex_postmake() {
echo -e '#!/bin/sh\nexec flex -l "$@"' > $root/usr/bin/lex
chmod +x $root/usr/bin/lex
echo -e '#!/bin/sh\nexec flex -l "$@"' > $instroot/usr/bin/lex
chmod +x $instroot/usr/bin/lex
}

Loading…
Cancel
Save