diff options
author | Sören Tempel <soeren+git@soeren-tempel.net> | 2018-06-18 15:56:44 +0200 |
---|---|---|
committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2018-06-18 16:25:54 +0200 |
commit | 82a4fbd003b6121cef0411e876b4b7a8c51cf24d (patch) | |
tree | abab6902d43e72219c05798808de9c638490a66f | |
parent | 5c73f2f17d0b29757ba56b8fdff9a834b3008bbb (diff) | |
download | alpine_aports-82a4fbd003b6121cef0411e876b4b7a8c51cf24d.tar.bz2 alpine_aports-82a4fbd003b6121cef0411e876b4b7a8c51cf24d.tar.xz alpine_aports-82a4fbd003b6121cef0411e876b4b7a8c51cf24d.zip |
testing/radare2: attempt to fix build on x86
See: https://github.com/radare/radare2/issues/10171#issuecomment-393116562
5 files changed, 649 insertions, 12 deletions
diff --git a/testing/radare2/0001-fix-for-build-with-syscapstone.patch b/testing/radare2/0001-fix-for-build-with-syscapstone.patch index 04bbaed49d..343e6866ef 100644 --- a/testing/radare2/0001-fix-for-build-with-syscapstone.patch +++ b/testing/radare2/0001-fix-for-build-with-syscapstone.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 032a5cacd98d86414dffee61265a567df10c48e2 Mon Sep 17 00:00:00 2001 | 1 | From 491b989889d6f74ae8ae7a31efae2ffbcacbea53 Mon Sep 17 00:00:00 2001 |
2 | From: cc <longlene@gmail.com> | 2 | From: "longlene@gmail.com" <longlene@gmail.com> |
3 | Date: Tue, 22 May 2018 12:52:12 +0800 | 3 | Date: Tue, 22 May 2018 12:52:12 +0800 |
4 | Subject: [PATCH 1/3] fix for build with syscapstone | 4 | Subject: [PATCH 1/4] fix for build with syscapstone |
5 | 5 | ||
6 | --- | 6 | --- |
7 | libr/Makefile | 9 +++++++-- | 7 | libr/Makefile | 9 +++++++-- |
diff --git a/testing/radare2/0002-libc-respect-zip-deps.mk-for-zlib-libzip-10163.patch b/testing/radare2/0002-libc-respect-zip-deps.mk-for-zlib-libzip-10163.patch index 63c2e4ddde..213ac94147 100644 --- a/testing/radare2/0002-libc-respect-zip-deps.mk-for-zlib-libzip-10163.patch +++ b/testing/radare2/0002-libc-respect-zip-deps.mk-for-zlib-libzip-10163.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From dcb863e18f619137c3fe040f632adccb13d07a09 Mon Sep 17 00:00:00 2001 | 1 | From 7764c6941aec70991ea9083e2ee564a6c7177b46 Mon Sep 17 00:00:00 2001 |
2 | From: Levente Polyak <levente@leventepolyak.net> | 2 | From: Levente Polyak <levente@leventepolyak.net> |
3 | Date: Wed, 23 May 2018 11:13:26 +0200 | 3 | Date: Wed, 23 May 2018 11:13:26 +0200 |
4 | Subject: [PATCH 2/3] libc: respect zip/deps.mk for zlib/libzip (#10163) | 4 | Subject: [PATCH 2/4] libc: respect zip/deps.mk for zlib/libzip (#10163) |
5 | 5 | ||
6 | Additionally respect standard caller {C,CPP,LD}FLAGS plus the | 6 | Additionally respect standard caller {C,CPP,LD}FLAGS plus the |
7 | deps.mk relaed LINK | 7 | deps.mk relaed LINK |
diff --git a/testing/radare2/0003-make-don-t-dist-.-LIBVERSION-into-usr-lib-10164.patch b/testing/radare2/0003-make-don-t-dist-.-LIBVERSION-into-usr-lib-10164.patch index a4d5562d19..06f77b25ca 100644 --- a/testing/radare2/0003-make-don-t-dist-.-LIBVERSION-into-usr-lib-10164.patch +++ b/testing/radare2/0003-make-don-t-dist-.-LIBVERSION-into-usr-lib-10164.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From ff045066c141efc56697ea0ca0a29f8960267bd3 Mon Sep 17 00:00:00 2001 | 1 | From 7a3234c2c895316311b2abb5b3c462ed2589d93e Mon Sep 17 00:00:00 2001 |
2 | From: Levente Polyak <levente@leventepolyak.net> | 2 | From: Levente Polyak <levente@leventepolyak.net> |
3 | Date: Wed, 30 May 2018 16:57:45 +0200 | 3 | Date: Wed, 30 May 2018 16:57:45 +0200 |
4 | Subject: [PATCH 3/3] make: don't dist .${LIBVERSION} into /usr/lib (#10164) | 4 | Subject: [PATCH 3/4] make: don't dist .${LIBVERSION} into /usr/lib (#10164) |
5 | 5 | ||
6 | Not exlucidng ^libr.{so,dynlin}$ doesn't do any good and will purely | 6 | Not exlucidng ^libr.{so,dynlin}$ doesn't do any good and will purely |
7 | result in distributing a .${LIBVERSION} into $DESTDIR | 7 | result in distributing a .${LIBVERSION} into $DESTDIR |
diff --git a/testing/radare2/0004-Add-with-libr-and-deprecate-with-nonpic-pic-merged-1.patch b/testing/radare2/0004-Add-with-libr-and-deprecate-with-nonpic-pic-merged-1.patch new file mode 100644 index 0000000000..cb6651a0ae --- /dev/null +++ b/testing/radare2/0004-Add-with-libr-and-deprecate-with-nonpic-pic-merged-1.patch | |||
@@ -0,0 +1,635 @@ | |||
1 | From e0616e674285bd7f0db787a8952c1be0e0a31e8f Mon Sep 17 00:00:00 2001 | ||
2 | From: radare <pancake@nopcode.org> | ||
3 | Date: Mon, 28 May 2018 17:14:49 +0200 | ||
4 | Subject: [PATCH 4/4] Add --with-libr and deprecate --with-{nonpic,pic,merged} | ||
5 | (#10212) | ||
6 | |||
7 | --- | ||
8 | binr/blob/Makefile | 48 ++++---------------------------------------- | ||
9 | binr/rabin2/Makefile | 2 -- | ||
10 | binr/rules.mk | 46 ++++++++++++++++++------------------------ | ||
11 | config-user.mk.acr | 4 +--- | ||
12 | configure | 16 +++++---------- | ||
13 | configure.acr | 4 +--- | ||
14 | libr/Makefile | 10 +++++---- | ||
15 | libr/bin/p/java.mk | 4 ---- | ||
16 | libr/parse/Makefile | 8 -------- | ||
17 | libr/rules.mk | 17 +++------------- | ||
18 | sys/android-build.sh | 6 +----- | ||
19 | sys/build-harden.sh | 2 +- | ||
20 | sys/emscripten.sh | 2 +- | ||
21 | sys/ios-sdk.sh | 15 ++++++-------- | ||
22 | sys/ios-simulator.sh | 5 ++--- | ||
23 | sys/ios-static.sh | 7 +++---- | ||
24 | sys/sdk.sh | 2 +- | ||
25 | sys/static.sh | 2 +- | ||
26 | sys/wasm.sh | 2 +- | ||
27 | 19 files changed, 57 insertions(+), 145 deletions(-) | ||
28 | |||
29 | diff --git a/binr/blob/Makefile b/binr/blob/Makefile | ||
30 | index c17fbf493..04e8cf57e 100644 | ||
31 | --- a/binr/blob/Makefile | ||
32 | +++ b/binr/blob/Makefile | ||
33 | @@ -3,15 +3,14 @@ DESTDIR?=/ | ||
34 | |||
35 | BINS=rabin2 rarun2 rasm2 ragg2 rahash2 rax2 rafind2 radiff2 | ||
36 | BINS2=radare2 ${BINS} | ||
37 | + | ||
38 | +SOURCES= main.c rabin2.c radare2.c radiff2.c rafind2.c | ||
39 | +SOURCES+=rahash2.c rarun2.c rasm2.c rax2.c ragg2.c | ||
40 | + | ||
41 | include ../../config-user.mk | ||
42 | |||
43 | -ifneq ($(OSTYPE),windows) | ||
44 | -CFLAGS+=-pie -fPIC -fPIE | ||
45 | -LDFLAGS+=-pie | ||
46 | -endif | ||
47 | SHLR=../../shlr | ||
48 | |||
49 | - | ||
50 | ifneq (${ANDROID},1) | ||
51 | ifneq (${OSTYPE},linux) | ||
52 | LDFLAGS+=-lpthread | ||
53 | @@ -22,41 +21,6 @@ endif | ||
54 | CFLAGS+=-I../../libr/include/ | ||
55 | CFLAGS+=-I$(SHLR)/spp | ||
56 | |||
57 | -#ifeq ($(STATIC_BUILD),1) | ||
58 | -ifeq ($(WITHNONPIC),1) | ||
59 | -LDFLAGS+=../../libr/config/libr_config.a | ||
60 | -LDFLAGS+=../../libr/io/libr_io.a | ||
61 | -LDFLAGS+=../../libr/asm/libr_asm.a | ||
62 | -LDFLAGS+=../../libr/egg/libr_egg.a | ||
63 | -LDFLAGS+=../../libr/core/libr_core.a | ||
64 | -LDFLAGS+=../../libr/crypto/libr_crypto.a | ||
65 | -LDFLAGS+=../../libr/parse/libr_parse.a | ||
66 | -LDFLAGS+=../../libr/anal/libr_anal.a | ||
67 | -LDFLAGS+=../../libr/fs/libr_fs.a | ||
68 | -LDFLAGS+=../../libr/magic/libr_magic.a | ||
69 | -LDFLAGS+=../../libr/cons/libr_cons.a | ||
70 | -LDFLAGS+=../../libr/syscall/libr_syscall.a | ||
71 | -LDFLAGS+=../../libr/flag/libr_flag.a | ||
72 | -LDFLAGS+=../../libr/reg/libr_reg.a | ||
73 | -LDFLAGS+=../../libr/debug/libr_debug.a | ||
74 | -LDFLAGS+=../../libr/search/libr_search.a | ||
75 | -LDFLAGS+=../../libr/lang/libr_lang.a | ||
76 | -LDFLAGS+=../../libr/bp/libr_bp.a | ||
77 | -LDFLAGS+=../../libr/hash/libr_hash.a | ||
78 | -LDFLAGS+=../../libr/bin/libr_bin.a | ||
79 | -LDFLAGS+=../../libr/util/libr_util.a | ||
80 | -# extra libs # | ||
81 | -ifeq (1,$(WITH_GPL)) | ||
82 | -LDFLAGS+=../../shlr/grub/libgrubfs.a | ||
83 | -endif | ||
84 | -LDFLAGS+=../../shlr/capstone/libcapstone.a | ||
85 | -LDFLAGS+=../../shlr/sdb/src/libsdb.a | ||
86 | -LDFLAGS+=../../shlr/gdb/lib/libgdbr.a | ||
87 | -LDFLAGS+=../../shlr/windbg/libr_windbg.a | ||
88 | -LDFLAGS+=../../shlr/java/libr_java.a | ||
89 | -LDFLAGS+=-lm | ||
90 | -LDFLAGS+=../../libr/socket/libr_socket.a | ||
91 | -else | ||
92 | LDFLAGS+=-L../../libr/io -lr_io | ||
93 | LDFLAGS+=-L../../libr/bp -lr_bp | ||
94 | LDFLAGS+=-L../../libr/socket -lr_socket | ||
95 | @@ -78,7 +42,6 @@ LDFLAGS+=-L../../libr/hash -lr_hash | ||
96 | LDFLAGS+=-L../../libr/debug -lr_debug | ||
97 | LDFLAGS+=-L../../libr/search -lr_search | ||
98 | LDFLAGS+=-L../../libr/config -lr_config | ||
99 | -endif | ||
100 | LDFLAGS+=${LINK} | ||
101 | |||
102 | include ../../libr/config.mk | ||
103 | @@ -102,9 +65,6 @@ clean: | ||
104 | mv version.k version.c | ||
105 | rm -f ${BINS2} r2 | ||
106 | |||
107 | -SOURCES= main.c rabin2.c radare2.c radiff2.c rafind2.c | ||
108 | -SOURCES+=rahash2.c rarun2.c rasm2.c rax2.c ragg2.c | ||
109 | - | ||
110 | build: | ||
111 | mv main.c main.k | ||
112 | mv version.c version.k | ||
113 | diff --git a/binr/rabin2/Makefile b/binr/rabin2/Makefile | ||
114 | index 71ea0565c..779d2a906 100644 | ||
115 | --- a/binr/rabin2/Makefile | ||
116 | +++ b/binr/rabin2/Makefile | ||
117 | @@ -6,7 +6,6 @@ BINDEPS+=r_search r_syscall r_socket r_fs r_magic r_crypto r_util | ||
118 | |||
119 | include ../rules.mk | ||
120 | |||
121 | -ifeq ($(WITHNONPIC),1) | ||
122 | include ../../libr/socket/deps.mk | ||
123 | include ../../shlr/zip/deps.mk | ||
124 | include ../../shlr/gdb/deps.mk | ||
125 | @@ -14,4 +13,3 @@ include ../../shlr/java/deps.mk | ||
126 | include ../../shlr/bochs/deps.mk | ||
127 | include ../../shlr/qnx/deps.mk | ||
128 | include ../../shlr/ar/deps.mk | ||
129 | -endif | ||
130 | diff --git a/binr/rules.mk b/binr/rules.mk | ||
131 | index 9fad60f49..30590fedc 100644 | ||
132 | --- a/binr/rules.mk | ||
133 | +++ b/binr/rules.mk | ||
134 | @@ -2,12 +2,9 @@ BINR_PROGRAM=1 | ||
135 | include ../../libr/config.mk | ||
136 | include ../../shlr/zip/deps.mk | ||
137 | |||
138 | -ifneq ($(OSTYPE),windows) | ||
139 | -# tcc doesn't recognize the -pie option | ||
140 | ifeq (,$(findstring tcc,${CC})) | ||
141 | CFLAGS+=-pie | ||
142 | endif | ||
143 | -endif | ||
144 | CFLAGS+=-I$(LTOP)/include | ||
145 | |||
146 | ifeq (${COMPILER},emscripten) | ||
147 | @@ -21,25 +18,26 @@ endif | ||
148 | OBJ+=${BIN}.o | ||
149 | BEXE=${BIN}${EXT_EXE} | ||
150 | |||
151 | -ifeq ($(WITHNONPIC),1) | ||
152 | -## LDFLAGS+=$(addsuffix /lib${BINDEPS}.a,$(addprefix ../../libr/,$(subst r_,,$(BINDEPS)))) | ||
153 | -LDFLAGS+=$(shell for a in ${BINDEPS} ; do b=`echo $$a |sed -e s,r_,,g`; echo ../../libr/$$b/lib$$a.${EXT_AR} ; done ) | ||
154 | -LDFLAGS+=../../shlr/sdb/src/libsdb.a | ||
155 | -ifeq (1,$(WITH_GPL)) | ||
156 | -LDFLAGS+=../../shlr/grub/libgrubfs.a | ||
157 | -endif | ||
158 | -LDFLAGS+=../../shlr/gdb/lib/libgdbr.a | ||
159 | -LDFLAGS+=../../shlr/windbg/libr_windbg.a | ||
160 | -LDFLAGS+=../../shlr/capstone/libcapstone.a | ||
161 | -LDFLAGS+=../../shlr/java/libr_java.a | ||
162 | -LDFLAGS+=../../libr/socket/libr_socket.a | ||
163 | -LDFLAGS+=../../libr/util/libr_util.a | ||
164 | -ifneq (${OSTYPE},haiku) | ||
165 | -ifneq ($(CC),cccl) | ||
166 | -LDFLAGS+=-lm | ||
167 | -endif | ||
168 | -endif | ||
169 | -endif | ||
170 | +# ifeq ($(WITHNONPIC),1) | ||
171 | +# ## LDFLAGS+=$(addsuffix /lib${BINDEPS}.a,$(addprefix ../../libr/,$(subst r_,,$(BINDEPS)))) | ||
172 | +# LDFLAGS+=$(shell for a in ${BINDEPS} ; do b=`echo $$a |sed -e s,r_,,g`; echo ../../libr/$$b/lib$$a.${EXT_AR} ; done ) | ||
173 | +# LDFLAGS+=../../shlr/sdb/src/libsdb.a | ||
174 | +# ifeq (1,$(WITH_GPL)) | ||
175 | +# LDFLAGS+=../../shlr/grub/libgrubfs.a | ||
176 | +# endif | ||
177 | +# LDFLAGS+=../../shlr/gdb/lib/libgdbr.a | ||
178 | +# LDFLAGS+=../../shlr/windbg/libr_windbg.a | ||
179 | +# LDFLAGS+=../../shlr/capstone/libcapstone.a | ||
180 | +# LDFLAGS+=../../shlr/java/libr_java.a | ||
181 | +# LDFLAGS+=../../libr/socket/libr_socket.a | ||
182 | +# LDFLAGS+=../../libr/util/libr_util.a | ||
183 | +# ifneq (${OSTYPE},haiku) | ||
184 | +# ifneq ($(CC),cccl) | ||
185 | +# LDFLAGS+=-lm | ||
186 | +# endif | ||
187 | +# endif | ||
188 | +# endif | ||
189 | + | ||
190 | LDFLAGS+=${DL_LIBS} | ||
191 | LDFLAGS+=${LINK} | ||
192 | ifneq (${ANDROID},1) | ||
193 | @@ -76,15 +74,11 @@ endif | ||
194 | |||
195 | # -static fails because -ldl -lpthread static-gcc ... | ||
196 | ${BEXE}: ${OBJ} ${SHARED_OBJ} | ||
197 | -ifeq ($(WITHNONPIC),1) | ||
198 | - ${CC} -pie ${CFLAGS} $+ -L.. -o $@ $(REAL_LDFLAGS) | ||
199 | -else | ||
200 | ifneq ($(SILENT),) | ||
201 | @echo LD $@ | ||
202 | endif | ||
203 | ${CC} ${CFLAGS} $+ -L.. -o $@ $(REAL_LDFLAGS) | ||
204 | endif | ||
205 | -endif | ||
206 | |||
207 | # Dummy myclean rule that can be overriden by the t/ Makefile | ||
208 | # TODO: move to config.mk ? it must be a precondition | ||
209 | diff --git a/config-user.mk.acr b/config-user.mk.acr | ||
210 | index 09965004f..fc0b5305d 100644 | ||
211 | --- a/config-user.mk.acr | ||
212 | +++ b/config-user.mk.acr | ||
213 | @@ -16,7 +16,7 @@ HAVE_LIB_GMP=@HAVE_LIB_GMP@ | ||
214 | USE_RPATH=@USE_RPATH@ | ||
215 | HAVE_JEMALLOC=@HAVE_JEMALLOC@ | ||
216 | HAVE_FORK=@HAVE_FORK@ | ||
217 | -BUILD_MERGED=@BUILD_MERGED@ | ||
218 | +WITH_LIBR=@WITH_LIBR@ | ||
219 | |||
220 | MKPLUGINS=mk/stat.mk mk/sloc.mk | ||
221 | |||
222 | @@ -46,8 +46,6 @@ endif | ||
223 | ifeq ($(OSTYPE),qnx) | ||
224 | DL_LIBS= | ||
225 | endif | ||
226 | -WITHPIC=@WITHPIC@ | ||
227 | -WITHNONPIC=@WITHNONPIC@ | ||
228 | |||
229 | # capstone | ||
230 | USE_CAPSTONE=@USE_CAPSTONE@ | ||
231 | diff --git a/configure b/configure | ||
232 | index 79810181f..3b9760d9c 100755 | ||
233 | --- a/configure | ||
234 | +++ b/configure | ||
235 | @@ -22,7 +22,7 @@ DEBUGGER=1 | ||
236 | USE_MAGIC=0 | ||
237 | LOADLIBS=1 | ||
238 | HAVE_FORK=1 | ||
239 | -BUILD_MERGED=0 | ||
240 | +WITH_LIBR=0 | ||
241 | WITH_CAPSTONE=0 | ||
242 | USE_ZIP=0 | ||
243 | WITH_GPL=1 | ||
244 | @@ -30,8 +30,6 @@ WANT_OPENSSL=0 | ||
245 | USE_RPATH=0 | ||
246 | [ -z "${USERCC}" ] && USERCC="gcc" | ||
247 | [ -z "${USEROSTYPE}" ] && USEROSTYPE="auto" | ||
248 | -WITHPIC=1 | ||
249 | -WITHNONPIC=0 | ||
250 | [ -z "${LIBVERSION}" ] && LIBVERSION="xxx" | ||
251 | HAVE_JEMALLOC=1 | ||
252 | split_host() { | ||
253 | @@ -169,7 +167,7 @@ Optional Features: | ||
254 | --with-sysmagic force to use system's magic | ||
255 | --disable-loadlibs disable loading plugins | ||
256 | --without-fork disable fork | ||
257 | - --enable-merged build merged r library | ||
258 | + --with-libr build libr.a and libr.dylib | ||
259 | --with-syscapstone force to use system-wide capstone | ||
260 | --with-syszip force to use system's libzip and zlib | ||
261 | --without-gpl do not build GPL code (grub, cxx, ... ) | ||
262 | @@ -177,8 +175,6 @@ Optional Features: | ||
263 | --with-rpath use rpath to build | ||
264 | --with-compiler Define compiler to use (see mk/) (USERCC=gcc) | ||
265 | --with-ostype Choose OS type ( gnulinux windows darwin haiku ) (USEROSTYPE=auto) | ||
266 | - --without-pic do not build libr as a program independent location | ||
267 | - --with-nonpic build the library archives .a | ||
268 | --with-libversion specify different libversion (LIBVERSION=xxx) | ||
269 | --without-jemalloc build without jemalloc | ||
270 | " | ||
271 | @@ -236,7 +232,7 @@ echo "LANGS: c" | ||
272 | echo "REQUIRED: libdl" | ||
273 | echo "OPTIONAL: libmagic libz libzip libssl" | ||
274 | echo "PKG-CONFIG: capstone openssl" | ||
275 | -echo "FLAGS: --disable-debugger --with-sysmagic --disable-loadlibs --without-fork --enable-merged --with-syscapstone --with-syszip --without-gpl --with-openssl --with-rpath --with-compiler=gcc --with-ostype=auto --without-pic --with-nonpic --with-libversion=xxx --without-jemalloc" | ||
276 | +echo "FLAGS: --disable-debugger --with-sysmagic --disable-loadlibs --without-fork --with-libr --with-syscapstone --with-syszip --without-gpl --with-openssl --with-rpath --with-compiler=gcc --with-ostype=auto --with-libversion=xxx --without-jemalloc" | ||
277 | exit 0 | ||
278 | ;; | ||
279 | --cache-file) | ||
280 | @@ -286,7 +282,7 @@ echo "FLAGS: --disable-debugger --with-sysmagic --disable-loadlibs --without | ||
281 | "--with-sysmagic") USE_MAGIC="1"; ;; | ||
282 | "--disable-loadlibs") LOADLIBS="0"; ;; | ||
283 | "--without-fork") HAVE_FORK="0"; ;; | ||
284 | -"--enable-merged") BUILD_MERGED="1"; ;; | ||
285 | +"--with-libr") WITH_LIBR="1"; ;; | ||
286 | "--with-syscapstone") WITH_CAPSTONE="1"; ;; | ||
287 | "--with-syszip") USE_ZIP="1"; ;; | ||
288 | "--without-gpl") WITH_GPL="0"; ;; | ||
289 | @@ -294,8 +290,6 @@ echo "FLAGS: --disable-debugger --with-sysmagic --disable-loadlibs --without | ||
290 | "--with-rpath") USE_RPATH="1"; ;; | ||
291 | --with-compiler) if [ -z "${value}" ]; then USERCC="gcc"; else USERCC="${value}" ; fi ;; | ||
292 | --with-ostype) if [ -z "${value}" ]; then USEROSTYPE="auto"; else USEROSTYPE="${value}" ; fi ;; | ||
293 | -"--without-pic") WITHPIC="0"; ;; | ||
294 | -"--with-nonpic") WITHNONPIC="1"; ;; | ||
295 | --with-libversion) if [ -z "${value}" ]; then LIBVERSION="xxx"; else LIBVERSION="${value}" ; fi ;; | ||
296 | "--without-jemalloc") HAVE_JEMALLOC="0"; ;; | ||
297 | *) if [ "$value" ]; then eval "`echo $flag2=$value`" ; | ||
298 | @@ -315,7 +309,7 @@ parse_options "$1" | ||
299 | shift | ||
300 | done | ||
301 | |||
302 | -ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR DOCDIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_PROGRAM_STRIP INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU PKGNAME VPATH VERSION CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS CPPFLAGS LDFLAGS HAVE_LANG_C DEBUGGER HAVE_LIB_DL DL_LIBS HAVE_PATCH PATCH HAVE_GIT GIT HAVE_LIB_MAGIC USE_MAGIC USE_LIB_MAGIC LIBMAGIC LOADLIBS HAVE_FORK BUILD_MERGED WITH_CAPSTONE CAPSTONE_CFLAGS CAPSTONE_LDFLAGS HAVE_PKGCFG_CAPSTONE USE_CAPSTONE HAVE_LIB_Z HAVE_LIB_ZIP USE_ZIP USE_LIB_ZIP LIBZIP WITH_GPL HAVE_DECL_ADDR_NO_RANDOMIZE HAVE_LIB_GMP HAVE_LIB_SSL SSL_CFLAGS SSL_LDFLAGS HAVE_PKGCFG_OPENSSL HAVE_OPENSSL WANT_OPENSSL USE_RPATH USERCC USEROSTYPE WITHPIC WITHNONPIC LIBVERSION HAVE_JEMALLOC" | ||
303 | +ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR DOCDIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_PROGRAM_STRIP INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU PKGNAME VPATH VERSION CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS CPPFLAGS LDFLAGS HAVE_LANG_C DEBUGGER HAVE_LIB_DL DL_LIBS HAVE_PATCH PATCH HAVE_GIT GIT HAVE_LIB_MAGIC USE_MAGIC USE_LIB_MAGIC LIBMAGIC LOADLIBS HAVE_FORK WITH_LIBR WITH_CAPSTONE CAPSTONE_CFLAGS CAPSTONE_LDFLAGS HAVE_PKGCFG_CAPSTONE USE_CAPSTONE HAVE_LIB_Z HAVE_LIB_ZIP USE_ZIP USE_LIB_ZIP LIBZIP WITH_GPL HAVE_DECL_ADDR_NO_RANDOMIZE HAVE_LIB_GMP HAVE_LIB_SSL SSL_CFLAGS SSL_LDFLAGS HAVE_PKGCFG_OPENSSL HAVE_OPENSSL WANT_OPENSSL USE_RPATH USERCC USEROSTYPE LIBVERSION HAVE_JEMALLOC" | ||
304 | |||
305 | create_environ | ||
306 | |||
307 | diff --git a/configure.acr b/configure.acr | ||
308 | index 7e1f365f8..8ad8645db 100644 | ||
309 | --- a/configure.acr | ||
310 | +++ b/configure.acr | ||
311 | @@ -26,7 +26,7 @@ ARG_DISABLE LOADLIBS loadlibs disable loading plugins ; | ||
312 | |||
313 | ARG_WITHOUT HAVE_FORK fork disable fork ; | ||
314 | |||
315 | -ARG_ENABLE BUILD_MERGED merged build merged r library ; | ||
316 | +ARG_WITH WITH_LIBR libr build libr.a and libr.dylib ; | ||
317 | |||
318 | ARG_WITH WITH_CAPSTONE syscapstone force to use system-wide capstone ; | ||
319 | PKGCFG CAPSTONE_CFLAGS CAPSTONE_LDFLAGS capstone | ||
320 | @@ -128,8 +128,6 @@ IFEQ USEROSTYPE auto ; { | ||
321 | } } } } } } } } } } | ||
322 | } | ||
323 | |||
324 | -ARG_WITHOUT WITHPIC pic do not build libr as a program independent location ; | ||
325 | -ARG_WITH WITHNONPIC nonpic build the library archives .a ; | ||
326 | (( this hack is required for openbsd ports )) | ||
327 | ARG_WITH LIBVERSION=xxx libversion specify different libversion ; | ||
328 | ARG_WITHOUT HAVE_JEMALLOC jemalloc build without jemalloc ; | ||
329 | diff --git a/libr/Makefile b/libr/Makefile | ||
330 | index 7e75a3a1e..706c0800b 100644 | ||
331 | --- a/libr/Makefile | ||
332 | +++ b/libr/Makefile | ||
333 | @@ -34,10 +34,12 @@ all: | ||
334 | $(MAKE) $(LIBS5) | ||
335 | $(MAKE) $(LIBS6) | ||
336 | $(MAKE) $(LIBS7) | ||
337 | +ifeq ($(WITH_LIBR),1) | ||
338 | $(MAKE) libr.${EXT_AR} | ||
339 | $(MAKE) libr.${EXT_SO} | ||
340 | +endif | ||
341 | |||
342 | -ifeq ($(BUILD_MERGED),1) | ||
343 | +ifeq ($(WITH_LIBR),1) | ||
344 | |||
345 | ifeq ($(OSTYPE),darwin) | ||
346 | MLFLAGS+=-install_name @rpath/libr2.dylib | ||
347 | @@ -99,13 +101,13 @@ libr.${EXT_SO}: .libr | ||
348 | |||
349 | else | ||
350 | |||
351 | -# BUILD_MERGED=0 | ||
352 | +# WITH_LIBR=0 | ||
353 | |||
354 | libr.${EXT_SO}: | ||
355 | - $(MAKE) libr.${EXT_SO} BUILD_MERGED=1 | ||
356 | + $(MAKE) libr.${EXT_SO} WITH_LIBR=1 | ||
357 | |||
358 | libr.${EXT_AR}: | ||
359 | - $(MAKE) libr.${EXT_AR} BUILD_MERGED=1 | ||
360 | + $(MAKE) libr.${EXT_AR} WITH_LIBR=1 | ||
361 | endif | ||
362 | |||
363 | ../shlr/libr_shlr.${EXT_AR}: | ||
364 | diff --git a/libr/bin/p/java.mk b/libr/bin/p/java.mk | ||
365 | index dad5a0e41..e5ebb1db9 100644 | ||
366 | --- a/libr/bin/p/java.mk | ||
367 | +++ b/libr/bin/p/java.mk | ||
368 | @@ -3,14 +3,11 @@ OBJ_JAVA=bin_java.o | ||
369 | SHARED2_JAVA=$(addprefix ../,${SHARED_JAVA}) | ||
370 | |||
371 | STATIC_OBJ+=${OBJ_JAVA} | ||
372 | -ifeq ($(WITHNONPIC),1) | ||
373 | STATIC_OBJ+=${SHARED2_JAVA} | ||
374 | -endif | ||
375 | |||
376 | SHARED_OBJ+=${SHARED_JAVA} | ||
377 | TARGET_JAVA=bin_java.${EXT_SO} | ||
378 | |||
379 | -ifeq ($(WITHPIC),1) | ||
380 | ALL_TARGETS+=${TARGET_JAVA} | ||
381 | |||
382 | ${TARGET_JAVA}: ${OBJ_JAVA} | ||
383 | @@ -18,4 +15,3 @@ ${TARGET_JAVA}: ${OBJ_JAVA} | ||
384 | $(LINK) $(LDFLAGS) ${SHARED2_JAVA} \ | ||
385 | ${SHLR}/java/libr_java.${EXT_AR} \ | ||
386 | ${SHLR}/sdb/src/libsdb.${EXT_AR} | ||
387 | -endif | ||
388 | diff --git a/libr/parse/Makefile b/libr/parse/Makefile | ||
389 | index b613eb86c..a62a1b828 100644 | ||
390 | --- a/libr/parse/Makefile | ||
391 | +++ b/libr/parse/Makefile | ||
392 | @@ -23,14 +23,6 @@ OBJS=parse.o code.o ${STATIC_OBJS} | ||
393 | bins: | ||
394 | # @cd t && ${MAKE} all | ||
395 | |||
396 | -pre: | ||
397 | -ifeq ($(WITHNONPIC),1) | ||
398 | - @if [ ! -e libr_parse.${EXT_AR} ]; then rm -f ${STATIC_OBJS} ; fi | ||
399 | -endif | ||
400 | -ifeq ($(WITHPIC),1) | ||
401 | - @if [ ! -e libr_parse.${EXT_SO} ]; then rm -f ${STATIC_OBJS} ; fi | ||
402 | -endif | ||
403 | - | ||
404 | plugins: | ||
405 | @cd p && ${MAKE} all | ||
406 | |||
407 | diff --git a/libr/rules.mk b/libr/rules.mk | ||
408 | index 25aaf39fe..042ad8112 100644 | ||
409 | --- a/libr/rules.mk | ||
410 | +++ b/libr/rules.mk | ||
411 | @@ -25,11 +25,6 @@ LINK+=-fvisibility=hidden | ||
412 | LINK+=$(addprefix -L../,$(subst r_,,$(BINDEPS))) | ||
413 | LINK+=$(addprefix -l,$(BINDEPS)) | ||
414 | |||
415 | -# for libraries (DUP) | ||
416 | -# implemented in libr/config.mk.tail | ||
417 | -#LDFLAGS+=$(addprefix -L../,$(subst r_,,$(DEPS))) | ||
418 | -#LDFLAGS+=$(addprefix -l,$(DEPS)) | ||
419 | - | ||
420 | SRC=$(subst .o,.c,$(OBJ)) | ||
421 | |||
422 | BEXE=$(BIN)$(EXT_EXE) | ||
423 | @@ -74,8 +69,6 @@ else | ||
424 | @-if [ -f p/Makefile ] ; then (echo "DIR ${NAME}/p"; cd p && ${MAKE}) ; fi | ||
425 | endif | ||
426 | |||
427 | -ifeq (1,1) | ||
428 | -#$(WITHPIC),1) | ||
429 | $(LIBSO): $(EXTRA_TARGETS) ${WFD} ${OBJS} ${SHARED_OBJ} | ||
430 | @for a in ${OBJS} ${SHARED_OBJ} ${SRC}; do \ | ||
431 | do=0 ; [ ! -e ${LIBSO} ] && do=1 ; \ | ||
432 | @@ -88,19 +81,15 @@ $(LIBSO): $(EXTRA_TARGETS) ${WFD} ${OBJS} ${SHARED_OBJ} | ||
433 | [ -f "$(LIBR)/stripsyms.sh" ] && sh $(LIBR)/stripsyms.sh ${LIBSO} ${NAME} ; \ | ||
434 | break ; \ | ||
435 | fi ; done | ||
436 | -else | ||
437 | -${LIBSO}: ; | ||
438 | -endif | ||
439 | |||
440 | -ifeq (1,1) #$(WITHNONPIC),1) | ||
441 | +ifeq ($(WITH_LIBR),1) | ||
442 | $(LIBAR): ${OBJS} | ||
443 | -ifneq ($(SILENT),) | ||
444 | - echo "CC_AR $(LIBAR)" | ||
445 | -endif | ||
446 | + [ "${SILENT}" = 1 ] && @echo "CC_AR $(LIBAR)" || true | ||
447 | rm -f $(LIBAR) | ||
448 | ${CC_AR} ${OBJS} ${SHARED_OBJ} | ||
449 | ${RANLIB} $(LIBAR) | ||
450 | else | ||
451 | +# ${LIBSO} $(LIBAR): ; | ||
452 | $(LIBAR): ; | ||
453 | endif | ||
454 | |||
455 | diff --git a/sys/android-build.sh b/sys/android-build.sh | ||
456 | index df71e0de3..84e774257 100755 | ||
457 | --- a/sys/android-build.sh | ||
458 | +++ b/sys/android-build.sh | ||
459 | @@ -73,11 +73,7 @@ local) | ||
460 | ;; | ||
461 | esac | ||
462 | |||
463 | -[ -z "${NDK_ARCH}" ] && NDK_ARCH=arm | ||
464 | [ -z "${STATIC_BUILD}" ] && STATIC_BUILD=0 | ||
465 | - | ||
466 | -# ow yeah | ||
467 | -STATIC_BUILD=1 | ||
468 | export NDK_ARCH | ||
469 | export STATIC_BUILD | ||
470 | PKG=`./configure --version|head -n1 |cut -d ' ' -f 1` | ||
471 | @@ -100,7 +96,7 @@ if [ "${BUILD}" = 1 ]; then | ||
472 | if [ 1 = 1 ]; then | ||
473 | make mrproper | ||
474 | if [ $STATIC_BUILD = 1 ]; then | ||
475 | - CFGFLAGS="--without-pic --with-nonpic" | ||
476 | + CFGFLAGS="--with-libr" | ||
477 | fi | ||
478 | # dup | ||
479 | echo ./configure --with-compiler=android \ | ||
480 | diff --git a/sys/build-harden.sh b/sys/build-harden.sh | ||
481 | index 7f0042fb1..1f28be647 100755 | ||
482 | --- a/sys/build-harden.sh | ||
483 | +++ b/sys/build-harden.sh | ||
484 | @@ -39,7 +39,7 @@ ${MAKE} mrproper > /dev/null 2>&1 | ||
485 | rm -f plugins.cfg | ||
486 | # STATIC BUILD | ||
487 | CFLAGS="${CFLAGS} -fPIE -fstack-protector-all -D_FORTIFY_SOURCE=2" | ||
488 | -CFGFLAGS="--without-pic --with-nonpic" | ||
489 | +CFGFLAGS="--with-libr" | ||
490 | export CFLAGS | ||
491 | |||
492 | # TODO: add this? | ||
493 | diff --git a/sys/emscripten.sh b/sys/emscripten.sh | ||
494 | index f3d659ec5..c1aeed5a3 100755 | ||
495 | --- a/sys/emscripten.sh | ||
496 | +++ b/sys/emscripten.sh | ||
497 | @@ -13,7 +13,7 @@ export CC="emcc --ignore-dynamic-linking -Oz" | ||
498 | export AR="emar" | ||
499 | |||
500 | CFGFLAGS="./configure --prefix=/usr --with-compiler=emscripten" | ||
501 | -CFGFLAGS="${CFGFLAGS} --disable-debugger --without-pic --with-nonpic" | ||
502 | +CFGFLAGS="${CFGFLAGS} --disable-debugger --with-libr" | ||
503 | |||
504 | make mrproper | ||
505 | cp -f plugins.emscripten.cfg plugins.cfg | ||
506 | diff --git a/sys/ios-sdk.sh b/sys/ios-sdk.sh | ||
507 | index 217715f82..83dd025ac 100755 | ||
508 | --- a/sys/ios-sdk.sh | ||
509 | +++ b/sys/ios-sdk.sh | ||
510 | @@ -20,23 +20,20 @@ export CC=`pwd`/sys/ios-sdk-gcc | ||
511 | export LD="xcrun --sdk iphoneos ld" | ||
512 | export IOSVER=9.0 | ||
513 | export IOSINC=`pwd`/sys/ios-include | ||
514 | -export USE_IOS_STORE=1 | ||
515 | export USE_IOS_STATIC=0 | ||
516 | |||
517 | +PLUGINS_CFG=plugins.ios-store.cfg | ||
518 | +#PLUGINS_CFG=plugins.ios.cfg | ||
519 | + | ||
520 | if [ "${EMBED_BITCODE}" = 1 ]; then | ||
521 | export CFLAGS="$CFLAGS -fembed-bitcode" | ||
522 | export LDFLAGS="$LDFLAGS -fembed-bitcode" | ||
523 | fi | ||
524 | |||
525 | iosConfigure() { | ||
526 | - if [ "${USE_IOS_STORE}" = 1 ]; then | ||
527 | - cp -f plugins.ios-store.cfg plugins.cfg | ||
528 | - else | ||
529 | - cp -f plugins.ios.cfg plugins.cfg | ||
530 | - fi | ||
531 | - ./configure --enable-merged --prefix=${PREFIX} --with-ostype=darwin \ | ||
532 | - --without-pic --with-nonpic --without-fork \ | ||
533 | - --with-compiler=ios-sdk --target=arm-unknown-darwin | ||
534 | + cp -f ${PLUGINS_CFG} plugins.cfg | ||
535 | + ./configure --with-libr --prefix=${PREFIX} --with-ostype=darwin \ | ||
536 | + --without-fork --with-compiler=ios-sdk --target=arm-unknown-darwin | ||
537 | return $? | ||
538 | } | ||
539 | |||
540 | diff --git a/sys/ios-simulator.sh b/sys/ios-simulator.sh | ||
541 | index 4007bb4d3..4385f9459 100755 | ||
542 | --- a/sys/ios-simulator.sh | ||
543 | +++ b/sys/ios-simulator.sh | ||
544 | @@ -71,9 +71,8 @@ fi | ||
545 | if true; then | ||
546 | make mrproper | ||
547 | cp -f ${PLGCFG} plugins.cfg | ||
548 | -./configure --prefix=${PREFIX} --with-ostype=darwin \ | ||
549 | - --without-fork --without-pic --with-nonpic \ | ||
550 | - --disable-debugger --with-compiler=ios-sdk \ | ||
551 | +./configure --prefix=${PREFIX} --with-ostype=darwin --with-libr \ | ||
552 | + --without-fork --disable-debugger --with-compiler=ios-sdk \ | ||
553 | --target=arm-unknown-darwin | ||
554 | fi | ||
555 | |||
556 | diff --git a/sys/ios-static.sh b/sys/ios-static.sh | ||
557 | index 060bc2ea7..53270c997 100755 | ||
558 | --- a/sys/ios-static.sh | ||
559 | +++ b/sys/ios-static.sh | ||
560 | @@ -14,6 +14,7 @@ if [ -z "${CPU}" ]; then | ||
561 | # export CPU=armv7 | ||
562 | fi | ||
563 | |||
564 | +R2BINS="radare2 rabin2 rasm2 r2pm r2agent radiff2 rafind2 ragg2 rahash2 rarun2 rasm2 rax2" | ||
565 | CAPSTONE_ARCHS="arm aarch64" | ||
566 | #export CAPSTONE_MAKEFLAGS="CAPSTONE_ARCHS=\"arm aarch64\"" | ||
567 | # Build all archs for capstone, not just ARM/ARM64 | ||
568 | @@ -63,15 +64,13 @@ cp -f plugins.tiny.cfg plugins.cfg | ||
569 | cp -f plugins.ios.cfg plugins.cfg | ||
570 | ./configure --prefix="${PREFIX}" \ | ||
571 | ${CFGFLAGS} \ | ||
572 | - --with-ostype=darwin \ | ||
573 | - --without-pic --with-nonpic \ | ||
574 | + --with-ostype=darwin --with-libr \ | ||
575 | --with-compiler=ios-sdk \ | ||
576 | --target=arm-unknown-darwin | ||
577 | fi | ||
578 | |||
579 | if [ $? = 0 ]; then | ||
580 | time ${MAKE} -j${MAKE_JOBS} CAPSTONE_ARCHS="${CAPSTONE_ARCHS}" | ||
581 | - #time ${MAKE} -j${MAKE_JOBS} | ||
582 | if [ $? = 0 ]; then | ||
583 | ( cd binr/radare2 ; ${MAKE} ios_sdk_sign ) | ||
584 | rm -rf /tmp/r2ios | ||
585 | @@ -87,7 +86,7 @@ if [ $? = 0 ]; then | ||
586 | export D=radare2-ios-${CPU} | ||
587 | rm -rf $D | ||
588 | mkdir -p $D/bin | ||
589 | - for a in radare2 rabin2 rasm2 r2pm r2agent radiff2 rafind2 ragg2 rahash2 rarun2 rasm2 rax2 ; do | ||
590 | + for a in ${R2BINS} ; do | ||
591 | cp -f binr/$a/$a "$D/bin" | ||
592 | done | ||
593 | mkdir -p "$D/include" | ||
594 | diff --git a/sys/sdk.sh b/sys/sdk.sh | ||
595 | index a7d5f284d..24cb6a1c5 100755 | ||
596 | --- a/sys/sdk.sh | ||
597 | +++ b/sys/sdk.sh | ||
598 | @@ -18,7 +18,7 @@ if [ -z "${R2_PLUGINS_CFG}" ]; then | ||
599 | fi | ||
600 | cp -f "${R2_PLUGINS_CFG}" plugins.cfg | ||
601 | #./configure-plugins | ||
602 | -./configure --prefix="$PREFIX" --with-nonpic --without-pic --without-gpl || exit 1 | ||
603 | +./configure --prefix="$PREFIX" --with-libr --without-gpl || exit 1 | ||
604 | #--disable-loadlibs || exit 1 | ||
605 | make -j8 || exit 1 | ||
606 | rm -rf "${SDKDIR}" | ||
607 | diff --git a/sys/static.sh b/sys/static.sh | ||
608 | index c78dfcd5c..16a6bce9a 100755 | ||
609 | --- a/sys/static.sh | ||
610 | +++ b/sys/static.sh | ||
611 | @@ -37,7 +37,7 @@ if [ 1 = "${DOCFG}" ]; then | ||
612 | cp -f plugins.static.cfg plugins.cfg | ||
613 | #-D__ANDROID__=1" | ||
614 | ./configure-plugins || exit 1 | ||
615 | - ./configure --prefix="$PREFIX" --with-nonpic --without-pic --disable-loadlibs || exit 1 | ||
616 | + ./configure --prefix="$PREFIX" --with-libr --disable-loadlibs || exit 1 | ||
617 | fi | ||
618 | ${MAKE} -j 8 || exit 1 | ||
619 | BINS="rarun2 rasm2 radare2 ragg2 rabin2 rax2 rahash2 rafind2 rasign2 r2agent radiff2" | ||
620 | diff --git a/sys/wasm.sh b/sys/wasm.sh | ||
621 | index 289dc7704..eceaf1213 100755 | ||
622 | --- a/sys/wasm.sh | ||
623 | +++ b/sys/wasm.sh | ||
624 | @@ -12,7 +12,7 @@ unset LDFLAGS | ||
625 | export CC="emcc -Os -s WASM=1 -s SIDE_MODULE=1" | ||
626 | export AR="emar" | ||
627 | |||
628 | -CFGFLAGS="./configure --prefix=/usr --disable-debugger --with-compiler=wasm --without-pic --with-nonpic" | ||
629 | +CFGFLAGS="./configure --prefix=/usr --disable-debugger --with-compiler=wasm --with-libr" | ||
630 | |||
631 | make mrproper | ||
632 | cp -f plugins.emscripten.cfg plugins.cfg | ||
633 | -- | ||
634 | 2.17.1 | ||
635 | |||
diff --git a/testing/radare2/APKBUILD b/testing/radare2/APKBUILD index 738d583085..a90d96a17f 100644 --- a/testing/radare2/APKBUILD +++ b/testing/radare2/APKBUILD | |||
@@ -5,7 +5,7 @@ | |||
5 | # Maintainer: Valery Kartel <valery.kartel@gmail.com> | 5 | # Maintainer: Valery Kartel <valery.kartel@gmail.com> |
6 | pkgname=radare2 | 6 | pkgname=radare2 |
7 | pkgver=2.6.0 | 7 | pkgver=2.6.0 |
8 | pkgrel=0 | 8 | pkgrel=1 |
9 | pkgdesc="An opensource, crossplatform reverse engineering framework" | 9 | pkgdesc="An opensource, crossplatform reverse engineering framework" |
10 | url="http://www.radare.org" | 10 | url="http://www.radare.org" |
11 | arch="all !aarch64" | 11 | arch="all !aarch64" |
@@ -19,7 +19,8 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg $pkgname-libs" | |||
19 | source="$pkgname-$pkgver.tar.gz::https://github.com/radare/$pkgname/archive/${pkgver}.tar.gz | 19 | source="$pkgname-$pkgver.tar.gz::https://github.com/radare/$pkgname/archive/${pkgver}.tar.gz |
20 | 0001-fix-for-build-with-syscapstone.patch | 20 | 0001-fix-for-build-with-syscapstone.patch |
21 | 0002-libc-respect-zip-deps.mk-for-zlib-libzip-10163.patch | 21 | 0002-libc-respect-zip-deps.mk-for-zlib-libzip-10163.patch |
22 | 0003-make-don-t-dist-.-LIBVERSION-into-usr-lib-10164.patch" | 22 | 0003-make-don-t-dist-.-LIBVERSION-into-usr-lib-10164.patch |
23 | 0004-Add-with-libr-and-deprecate-with-nonpic-pic-merged-1.patch" | ||
23 | builddir="$srcdir"/$pkgname-$pkgver | 24 | builddir="$srcdir"/$pkgname-$pkgver |
24 | 25 | ||
25 | build() { | 26 | build() { |
@@ -45,6 +46,7 @@ package() { | |||
45 | } | 46 | } |
46 | 47 | ||
47 | sha512sums="44e7d0c10e17b40d4d71af851cf462c159b03b3242dfccd786bd54d3cf9f92441084f26694166dd1385e84c00626f45dbe09d1fe713595721723c468ac47b01b radare2-2.6.0.tar.gz | 48 | sha512sums="44e7d0c10e17b40d4d71af851cf462c159b03b3242dfccd786bd54d3cf9f92441084f26694166dd1385e84c00626f45dbe09d1fe713595721723c468ac47b01b radare2-2.6.0.tar.gz |
48 | 3d7500e805d14cbe12b856a57c2d6efb37c968210f1bfc6bfea4517a9234b02fc0e924c6c9fd9475d05b18a998abaed642cc5714b996f9d02c07d74e81f17c10 0001-fix-for-build-with-syscapstone.patch | 49 | 4a9c7ae1e3c692ba5a43f93142f8df6d9791ce580ff695e0dfe6587b07958eaf1cbb3e458a2331a1a05366778e0ed1a8db3808a395ecf8f9a9b55276755239b7 0001-fix-for-build-with-syscapstone.patch |
49 | 2f91f1718784ad77449596e828847d215556b2409a4c83f2d8d895c6b1d41f8b94f25d9450d15b595d008e8587c1eb687a0a8d8b4777a4a9b64411a0f6549c9d 0002-libc-respect-zip-deps.mk-for-zlib-libzip-10163.patch | 50 | cdb37652ff6f987d7882d26e07d9a7e4f1116187551abf7b6f25c3a2e9b1ed5a2267e8d5351df470d8d1379940afdd56d669a92bdf47ad71c50a55641182c4a8 0002-libc-respect-zip-deps.mk-for-zlib-libzip-10163.patch |
50 | d7ee63b301a6191eb0504b50ee19e3aaadd3fdd08389c9d043dcade8c0115bc862464899c1e0607f860f21e5e890cdd416362cbc4b098e149ecdba765e8f4548 0003-make-don-t-dist-.-LIBVERSION-into-usr-lib-10164.patch" | 51 | f85861cb02e46200d70f18fbdfc1c176ef7c61dc33fb153d5d02a900e6f0b348e8d47e882637a28d6a48d6b90a55be9ad5b3007fd2794153ad4d47da47160b6e 0003-make-don-t-dist-.-LIBVERSION-into-usr-lib-10164.patch |
52 | 6498d50b83d3d4e769f3a0560e5a36818726f3e8907b119da68c040d7a94c340b5e319f285a038647bc5f1f5269b303520c60363ecf33fc2169d56f96878b6cc 0004-Add-with-libr-and-deprecate-with-nonpic-pic-merged-1.patch" | ||