CRUX-ARM :
Home
Home
::
Documentation
::
Download
::
Development
::
Community
::
Ports
::
Packages
::
Bugs
::
Links
::
About
::
Donors
development
/
pkgutils-cross.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Fixed bsdtar invocation, need to solve problems with modification times."
[pkgutils-cross.git]
/
src
/
pkgmk.in
diff --git
a/src/pkgmk.in
b/src/pkgmk.in
index 7378def28e515e5531c5ac5c69986f8ad485d257..9fa7e81dcbf81a9eaf10badc17c66dfba8dc4a3c 100755
(executable)
--- a/
src/pkgmk.in
+++ b/
src/pkgmk.in
@@
-166,7
+166,7
@@
unpack_source() {
LOCAL_FILENAME=`get_filename $FILE`
case $LOCAL_FILENAME in
*.tar.gz|*.tar.Z|*.tgz|*.tar.bz2|*.tar.xz|*.tar.lzma|*.zip)
LOCAL_FILENAME=`get_filename $FILE`
case $LOCAL_FILENAME in
*.tar.gz|*.tar.Z|*.tgz|*.tar.bz2|*.tar.xz|*.tar.lzma|*.zip)
- COMMAND="bsdtar -
m -
p -o -C $SRC -xf $LOCAL_FILENAME" ;;
+ COMMAND="bsdtar -p -o -C $SRC -xf $LOCAL_FILENAME" ;;
*)
COMMAND="cp $LOCAL_FILENAME $SRC" ;;
esac
*)
COMMAND="cp $LOCAL_FILENAME $SRC" ;;
esac
@@
-305,6
+305,13
@@
compress_manpages() {
done
}
done
}
+fix_cross_paths() {
+ # remove the last / from CLFS path if appeared
+ CLFS=${CLFS%*/}
+
+ find $PKG -type f -name '*.la' -exec sed "s|$CLFS||g" -i {} \;
+}
+
check_footprint() {
local FILE="$PKGMK_WORK_DIR/.tmp"
check_footprint() {
local FILE="$PKGMK_WORK_DIR/.tmp"
@@
-377,6
+384,7
@@
build_package() {
fi
compress_manpages
fi
compress_manpages
+ fix_cross_paths
cd $PKG
info "Build result:"
cd $PKG
info "Build result:"