{un,-}set_build_vars(): set PKG_CONFIG_LIBDIR.
This commit is contained in:
parent
cfdb2825ec
commit
84a4e9e377
|
@ -48,11 +48,14 @@ set_build_vars()
|
||||||
export LD_LIBRARY_PATH="$LDLIBPATH"
|
export LD_LIBRARY_PATH="$LDLIBPATH"
|
||||||
export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR"
|
export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR"
|
||||||
export PKG_CONFIG="$PKG_CONFIG"
|
export PKG_CONFIG="$PKG_CONFIG"
|
||||||
|
else
|
||||||
|
PKG_CONFIG_LIBDIR="/usr/lib/pkgconfig"
|
||||||
fi
|
fi
|
||||||
CFLAGS="$CFLAGS $XBPS_CFLAGS"
|
CFLAGS="$CFLAGS $XBPS_CFLAGS"
|
||||||
CXXFLAGS="$CXXFLAGS $XBPS_CXXFLAGS"
|
CXXFLAGS="$CXXFLAGS $XBPS_CXXFLAGS"
|
||||||
|
|
||||||
export CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS"
|
export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR" \
|
||||||
|
CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS"
|
||||||
}
|
}
|
||||||
|
|
||||||
unset_build_vars()
|
unset_build_vars()
|
||||||
|
@ -62,5 +65,5 @@ unset_build_vars()
|
||||||
unset PKG_CONFIG LD_LIBRARY_PATH
|
unset PKG_CONFIG LD_LIBRARY_PATH
|
||||||
export LD_LIBRARY_PATH=$SAVE_LDLIBPATH
|
export LD_LIBRARY_PATH=$SAVE_LDLIBPATH
|
||||||
fi
|
fi
|
||||||
unset CFLAGS CXXFLAGS
|
unset PKG_CONFIG_LIBDIR CFLAGS CXXFLAGS
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user