Remove pkg-config-transform helper, it's not useful right now.
--HG-- extra : convert_revision : 7c9627f3487c03ae21c1b4ca7682cffdb62808fb
This commit is contained in:
parent
0c2a5b90da
commit
d987a000cc
2 changed files with 1 additions and 31 deletions
|
@ -1,19 +0,0 @@
|
||||||
#
|
|
||||||
# This helper will transform the pkg-config files with correct
|
|
||||||
# directories pointing at XBPS_MASTERDIR specified in the config file.
|
|
||||||
#
|
|
||||||
pkgconfig_transform_file()
|
|
||||||
{
|
|
||||||
local file="$1"
|
|
||||||
local pkg="$pkgname-$version"
|
|
||||||
|
|
||||||
[ -z "$file" ] && return 1
|
|
||||||
|
|
||||||
$sed_cmd \
|
|
||||||
-e "s|^exec_prefix=$XBPS_DESTDIR/$pkg.*$|exec_prefix=\${prefix}|" \
|
|
||||||
-e "s|-L\${libdir}|-L\${libdir} -Wl,-R\${libdir}|" \
|
|
||||||
$file > $file.in && \
|
|
||||||
$mv_cmd $file.in $file
|
|
||||||
[ "$?" -eq 0 ] && \
|
|
||||||
echo "=> Transformed pkg-config file: $(basename $file)."
|
|
||||||
}
|
|
13
xbps.sh
13
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 pkgconfig_override \
|
patch_files make_cmd \
|
||||||
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 \
|
||||||
|
@ -871,17 +871,6 @@ install_src_phase()
|
||||||
[ -n "$run_stuff_after_install_cmd" ] && ${run_stuff_after_install_cmd}
|
[ -n "$run_stuff_after_install_cmd" ] && ${run_stuff_after_install_cmd}
|
||||||
unset raif
|
unset raif
|
||||||
|
|
||||||
#
|
|
||||||
# Transform pkg-config files if requested by template.
|
|
||||||
#
|
|
||||||
for i in ${pkgconfig_override}; do
|
|
||||||
local tmpf="$XBPS_DESTDIR/$pkgname-$version/lib/pkgconfig/$i"
|
|
||||||
[ -f "$tmpf" ] && \
|
|
||||||
[ -f $XBPS_TMPLHELPDIR/pkg-config-transform.sh ] && \
|
|
||||||
. $XBPS_TMPLHELPDIR/pkg-config-transform.sh && \
|
|
||||||
pkgconfig_transform_file $tmpf
|
|
||||||
done
|
|
||||||
|
|
||||||
# Unset build vars.
|
# Unset build vars.
|
||||||
unset_build_vars
|
unset_build_vars
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue