mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
Don't forget to unset base_package and add another pattern to
fixup_la_files. --HG-- extra : convert_revision : f5ea720e905e7a1512560fb764a771f9641054b5
This commit is contained in:
parent
d987a000cc
commit
206a4e1485
1 changed files with 3 additions and 3 deletions
6
xbps.sh
6
xbps.sh
|
@ -209,7 +209,7 @@ reset_tmpl_vars()
|
||||||
local TMPL_VARS="pkgname distfiles configure_args configure_env \
|
local TMPL_VARS="pkgname distfiles configure_args configure_env \
|
||||||
make_build_args make_install_args build_style \
|
make_build_args make_install_args build_style \
|
||||||
short_desc maintainer long_desc checksum wrksrc \
|
short_desc maintainer long_desc checksum wrksrc \
|
||||||
patch_files make_cmd \
|
patch_files make_cmd base_package \
|
||||||
make_env make_build_target configure_script \
|
make_env make_build_target configure_script \
|
||||||
run_stuff_before_configure_cmd run_stuff_before_build_cmd \
|
run_stuff_before_configure_cmd run_stuff_before_build_cmd \
|
||||||
run_stuff_before_install_cmd run_stuff_after_install_cmd \
|
run_stuff_before_install_cmd run_stuff_after_install_cmd \
|
||||||
|
@ -547,8 +547,8 @@ fixup_la_files()
|
||||||
for f in $(find $wrksrc -type f -name \*.la*); do
|
for f in $(find $wrksrc -type f -name \*.la*); do
|
||||||
if [ -f $f ]; then
|
if [ -f $f ]; then
|
||||||
echo "Replacing libtool archive: $f"
|
echo "Replacing libtool archive: $f"
|
||||||
sed -i -e "s|\/..\/lib||g" \
|
sed -i -e "s|\/..\/lib||g;s|\/\/lib|/usr/lib|g" \
|
||||||
-e "s|$XBPS_MASTERDIR||g;" \
|
-e "s|$XBPS_MASTERDIR||g;" \
|
||||||
-e "s|$XBPS_DESTDIR/$pkgname-$version||g" $f
|
-e "s|$XBPS_DESTDIR/$pkgname-$version||g" $f
|
||||||
awk '{ if (/^ dependency_libs/) {gsub("/usr[^]*lib","lib");}print}' \
|
awk '{ if (/^ dependency_libs/) {gsub("/usr[^]*lib","lib");}print}' \
|
||||||
$f > $f.in && mv $f.in $f
|
$f > $f.in && mv $f.in $f
|
||||||
|
|
Loading…
Add table
Reference in a new issue