pygos
/
build
mirror of https://github.com/pygos/build.git
1
0
Fork 0
Code Issues Releases Wiki Activity

cleanup: remove unneeded parameter from deploy_dev_cleanup 

Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
This commit is contained in:
David Oberhollenzer 2019-03-05 16:09:55 +01:00
parent 705290a2cb
commit b3529c8deb
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mk.sh
View File

@ -101,7 +101,7 @@ while read pkg; do
run_pkg_command "build"
run_pkg_command "deploy"
deploy_dev_cleanup "$PKGDEPLOYDIR"
deploy_dev_cleanup
strip_files ${PKGDEPLOYDIR}/{bin,lib}
for f in $SUBPKG; do

1
pkg/tc-gcc2/build
View File

@ -34,7 +34,6 @@ deploy() {
mkdir -p "$DEPLOY/lib"
mv ${TCDIR}/${TARGET}/{include,lib} "$DEPLOY"
deploy_dev_cleanup "$DEPLOY"
cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
cat >> "$DEPLOY/libstdc++-dev.files" <<_EOF

10
util/misc.sh
View File

@ -29,13 +29,13 @@ strip_files() {
deploy_dev_cleanup() {
local f
if [ -d "$1/share/pkgconfig" ]; then
mkdir -p "$1/lib/pkgconfig"
mv $1/share/pkgconfig/* "$1/lib/pkgconfig"
rmdir "$1/share/pkgconfig"
if [ -d "$PKGDEPLOYDIR/share/pkgconfig" ]; then
mkdir -p "$PKGDEPLOYDIR/lib/pkgconfig"
mv $PKGDEPLOYDIR/share/pkgconfig/* "$PKGDEPLOYDIR/lib/pkgconfig"
rmdir "$PKGDEPLOYDIR/share/pkgconfig"
fi
for f in ${1}/lib/*.la; do
for f in $PKGDEPLOYDIR/lib/*.la; do
[ ! -e "$f" ] || rm "$f"
done
}