c987560802
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
29 lines
645 B
Diff
29 lines
645 B
Diff
--- a/configure
|
|
+++ b/configure
|
|
@@ -636,10 +636,11 @@
|
|
}
|
|
EOF
|
|
|
|
-$CC -o .1 .1.c
|
|
-COMPILER=`./.1 2> /dev/null`
|
|
-r=$?
|
|
-rm -f .1.c .1
|
|
+r=1
|
|
+case "`$CC --version`" in
|
|
+*clang*) COMPILER=clang; r=0 ;;
|
|
+*GCC*) COMPILER=gcc; r=0 ;;
|
|
+esac
|
|
|
|
if test "$r" -ne 0; then
|
|
assert "" "update compiler"
|
|
--- a/src/Makefile.in
|
|
+++ b/src/Makefile.in
|
|
@@ -25,7 +25,7 @@
|
|
$(LD) $(LDFLAGS) -o $(TARGET_DIR)/libck.so $(OBJECTS)
|
|
|
|
libck.a: $(OBJECTS)
|
|
- ar rcs $(TARGET_DIR)/libck.a $(OBJECTS)
|
|
+ $(AR) rcs $(TARGET_DIR)/libck.a $(OBJECTS)
|
|
|
|
ck_array.o: $(INCLUDE_DIR)/ck_array.h $(SDIR)/ck_array.c
|
|
$(CC) $(CFLAGS) -c -o $(TARGET_DIR)/ck_array.o $(SDIR)/ck_array.c
|