tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Set LDFLAGS with correct compile and run time paths before building.

Browse Source 
Use local variables where possible.

--HG--
extra : convert_revision : 39a0153d9f11cd1889c1dfbba015a71e344352d0
This commit is contained in:
Juan RP 2008-09-28 10:36:43 +02:00
parent 8a62250ba8
commit df628fc68e
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgfs.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# pkgfs - Builds source distribution files and stows/unstows them into # pkgfs - Builds source distribution files and stows/unstows them into
# a master directory. # a master directory, thanks to Xstow.
# #
#- #-
# Copyright (c) 2008 Juan Romero Pardines. # Copyright (c) 2008 Juan Romero Pardines.
@ -33,6 +33,7 @@
# Multiple URLs to download source distribution files. # Multiple URLs to download source distribution files.
# Support GNU/BSD-makefile style source distribution files. # Support GNU/BSD-makefile style source distribution files.
# Fix PKGFS_{C,CXX}FLAGS, aren't passed to the environment yet. # Fix PKGFS_{C,CXX}FLAGS, aren't passed to the environment yet.
# Support adding filters to templates to avoid creating useless links.
# #
# #
# Default path to configuration file, can be overriden # Default path to configuration file, can be overriden
@ -116,7 +117,7 @@ run_file()
info_tmpl() info_tmpl()
{ {
tmplfile="$1" local tmplfile="$1"
if [ -z "$tmplfile" -o ! -f "$tmplfile" ]; then if [ -z "$tmplfile" -o ! -f "$tmplfile" ]; then
echo -n "*** ERROR: invalid template file '$tmplfile'," echo -n "*** ERROR: invalid template file '$tmplfile',"
echo ", aborting ***" echo ", aborting ***"
@ -412,6 +413,10 @@ build_tmpl_sources()
echo "*** Building binary distribution from $pkgname ***" echo "*** Building binary distribution from $pkgname ***"
#
# For now, just set LDFLAGS.
#
export LDFLAGS="-L$PKGFS_MASTERDIR/lib -Wl,-R$PKGFS_MASTERDIR/lib"
# #
# Packages using GNU autoconf # Packages using GNU autoconf
# #
@ -424,6 +429,9 @@ build_tmpl_sources()
./configure --prefix="$PKGFS_MASTERDIR" ${configure_args} \ ./configure --prefix="$PKGFS_MASTERDIR" ${configure_args} \
--mandir="$PKGFS_DESTDIR/$pkgname/man" --mandir="$PKGFS_DESTDIR/$pkgname/man"
#
# Packages using propietary configure scripts.
#
elif [ "$build_style" = "configure" ]; then elif [ "$build_style" = "configure" ]; then
cd $pkg_builddir cd $pkg_builddir
@ -462,6 +470,8 @@ build_tmpl_sources()
exit 1 exit 1
fi fi
unset LDFLAGS
echo "*** binary distribution built for $pkgname ***" echo "*** binary distribution built for $pkgname ***"
if [ -d "$pkg_builddir" -a -z "$dontrm_builddir" ]; then if [ -d "$pkg_builddir" -a -z "$dontrm_builddir" ]; then