Skip to content

Commit

Permalink
Buildsystem patches:
Browse files Browse the repository at this point in the history
- allow symlink for sources and .work
- add missing char in printf statements in scripts directory
  • Loading branch information
susisstrolch committed Jul 19, 2012
1 parent 9385e6b commit 71c0db4
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 9 deletions.
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,11 @@ mkpkg-temp

# private working directory
/.work/

# symlinks...
/sources
/.work

# backup files
*.orig

2 changes: 1 addition & 1 deletion scripts/autoreconf
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

[ ! -f "$PKG_BUILD/configure.in" -a ! -f "$PKG_BUILD/configure.ac" ] && echo "configure.in or configure.ac not found" && exit 1

printf "%${INDENT}c AUTORECONF $1\n" >&$SILENT_OUT
printf "%${INDENT}c AUTORECONF $1\n" ' '>&$SILENT_OUT
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))

do_autoreconf $PKG_BUILD
Expand Down
2 changes: 1 addition & 1 deletion scripts/build
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ fi
if [ ! -f $STAMP ]; then
rm -f $STAMP

printf "%${INDENT}c BUILD $1\n" >&$SILENT_OUT
printf "%${INDENT}c BUILD $1\n" ' '>&$SILENT_OUT
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))

for p in $PKG_BUILD_DEPENDS; do
Expand Down
2 changes: 1 addition & 1 deletion scripts/create_addon
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ fi

$SCRIPTS/build $@

printf "%${INDENT}c CREATE ADDON $1\n" >&$SILENT_OUT
printf "%${INDENT}c CREATE ADDON $1\n" ' '>&$SILENT_OUT
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))

if [ -f $PKG_DIR/addon ]; then
Expand Down
2 changes: 1 addition & 1 deletion scripts/get
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ if [ -n "$PKG_URL" ]; then

rm -f $STAMP

printf "%${INDENT}c GET $1\n" >&$SILENT_OUT
printf "%${INDENT}c GET $1\n" ' '>&$SILENT_OUT
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))

until [ -f "$STAMP" ] || $WGET_CMD $i || $WGET_CMD $PACKAGE_MIRROR; do
Expand Down
2 changes: 1 addition & 1 deletion scripts/install
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ fi

$SCRIPTS/build $@

printf "%${INDENT}c INSTALL $1\n" >&$SILENT_OUT
printf "%${INDENT}c INSTALL $1\n" ' '>&$SILENT_OUT
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))

for p in $PKG_DEPENDS; do
Expand Down
8 changes: 4 additions & 4 deletions scripts/unpack
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ done

[ -f "$STAMP" ] && exit 0

printf "%${INDENT}c UNPACK $1\n" >&$SILENT_OUT
printf "%${INDENT}c UNPACK $1\n" ' '>&$SILENT_OUT
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))

rm -rf $BUILD/$1[-_][0-9]*
Expand Down Expand Up @@ -82,10 +82,10 @@ for i in $PKG_DIR/patches/$PKG_NAME-$PKG_VERSION*.patch ; do
PATCH=`basename $i`
PT=`echo $PATCH | sed 's/.*\.\(.*\)$/\1/'`
if [ "$PT" != "patch" -a "$PT" != "$TARGET_ARCH" ]; then
printf "%${INDENT}c SKIP PATCH: $i\n" >&$SILENT_OUT
printf "%${INDENT}c SKIP PATCH: $i\n" ' '>&$SILENT_OUT
continue;
else
printf "%${INDENT}c APPLY PATCH: $i\n" >&$SILENT_OUT
printf "%${INDENT}c APPLY PATCH: $i\n" ' '>&$SILENT_OUT
cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT
fi
fi
Expand All @@ -94,7 +94,7 @@ done
[ -f "$PKG_DIR/unpack" ] && $PKG_DIR/unpack $@ >&$VERBOSE_OUT

for config in `find $BUILD/$1* -name config.guess | sed 's/config.guess//'`; do
printf "%${INDENT}c FIXCONFIG: $config\n" >&$SILENT_OUT
printf "%${INDENT}c FIXCONFIG: $config\n" ' '>&$SILENT_OUT

[ -f "$config/config.guess" ] && cp -f $SCRIPTS/configtools/config.guess $config
[ -f "$config/config.sub" ] && cp -f $SCRIPTS/configtools/config.sub $config
Expand Down

0 comments on commit 71c0db4

Please sign in to comment.