Re: pkg/47206 (build problems with xulrunner 16.0.2: : 'malloc_usable_size' was not declared in this scope)

[Richard PALO <richard.palo%baou.fr@localhost>]

Le 22/11/12 18:50, RichardPALO a écrit :
>   creating ./config.status
>   creating config files and headers...
>   invoking make to create js-config script
>   find: bad option -path
>   find: [-E] [-H | -L] path-list predicate-list

Although this didn't fix the primary bug report with malloc_usable_size 
nor abort, the patch below seems to get over the find problem.

Could a "find" expert validate/repair my feeble attempt to make portable 
the following:

find $(srcdir) \( -name "*.cpp" -o -name "*.h" \) ! -path "*/dist/*" ! 
-path "*/config/*")

to:

find $(srcdir) ! \( -type d -name "dist" -o -name "config" -prune \) 
-name "*.cpp" -o -name "*.h")


Extract from attached log:

creating ./config.status
creating config files and headers...
invoking make to create js-config script
rm -f js-config.tmp
sed < js-config.in > js-config.tmp \
-e 's|@prefix@|/tmp/pkgsrc/devel/xulrunner/work/mozilla-esr17/dist|' \
-e 's|@exec_prefix@|/tmp/pkgsrc/devel/xulrunner/work/mozilla-esr17/dist|' \
-e 
's|@includedir@|/tmp/pkgsrc/devel/xulrunner/work/mozilla-esr17/dist/include|' 
\
-e 's|@libdir@|/tmp/pkgsrc/devel/xulrunner/work/mozilla-esr17/dist/lib|' \
-e 's|@MOZILLA_VERSION@||' \
-e 's|@LIBRARY_NAME@|mozjs|' \
-e 's|@NSPR_CFLAGS@|-I/opt/pkg/include/nspr|' \
-e 's|@JS_CONFIG_LIBS@|-Wl,-R/opt/pkg/lib -L/opt/pkg/lib -lffi 
-Wl,-R/opt/pkg/lib/nspr -L/opt/pkg/lib/nspr -lplds4 -lplc4 -lnspr4 
-L/opt/pkg/gcc47/lib/gcc/x86_64-sun-solaris2.11/4.7.2 
-L/opt/pkg/gcc47/lib -L/opt/pkg/lib -lpthread -ldl -lposix4 -lsocket -lc 
-lsocket -lc  -lm -lz -lposix4 -ldl -lnsl -lsocket|' \
-e 
's|@MOZ_JS_LIBS@|-L/tmp/pkgsrc/devel/xulrunner/work/mozilla-esr17/dist/lib 
-lmozjs|' \
&& mv js-config.tmp js-config && chmod +x js-config


The new patchfile patch-js_src_Makefile.in obsoletes patch-ml.

richard@devzone:~/src/pkgsrc/devel/xulrunner$ cvs diff
? patches/patch-js_src_Makefile.in
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/xulrunner/distinfo,v
retrieving revision 1.84
diff -u -p -r1.84 distinfo
--- distinfo    21 Nov 2012 15:26:49 -0000      1.84
+++ distinfo    23 Nov 2012 05:31:21 -0000
@@ -62,6 +62,7 @@ SHA1 (patch-ipc_chromium_src_chrome_comm
 SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = 
15146bd327bb51b8de0783ff28b70201e3bfa532
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 
be69744c199bae64c41455ff31efe2498b859414
 SHA1 (patch-ipc_glue_SharedMemorySysV.h) = 
c82d7fd5f1a099da175107401c725cfd5ea81845
+SHA1 (patch-js_src_Makefile.in) = ca4752fbec941a3215e3285c0dda8de55e474c2e
 SHA1 (patch-js_src_config_system-headers) = 
86f1aa66f8a35d6967c2cd03d05b6dd57209a690
 SHA1 (patch-js_src_jscpucfg.h) = afce65ca5964fb732d96cf22902f89cd02aedf0d
 SHA1 (patch-js_src_jsgc.cpp) = 0e617094a4b7d87cdf801d9bc4ac1f52d909a12a
@@ -79,7 +80,6 @@ SHA1 (patch-mh) = 8c56d7467e90944be18630
 SHA1 (patch-mi) = 56bf4b5900eef022e9959e9287dadd479a725ed6
 SHA1 (patch-mj) = a29a3b2189103526d0cc040459d6f0b11b77f837
 SHA1 (patch-mk) = d9f0663d3d2762963f4c018a028eb5346106edb8
-SHA1 (patch-ml) = 71c4eb8822755dd17cd4add11687d8cf52a12f6f
 SHA1 (patch-mm) = 2ba1f9bd6836141d819abf046c4b0b3431d777f9
 SHA1 (patch-mn) = 621eeb1c76e52b61f8c8b11e6708131900fd5df7
 SHA1 (patch-mp) = 2dc3ae213ce41b5c68105b8d90ef1ce81f0029bc
cvs diff: cannot find patches/patch-ml
richard@devzone:~/src/pkgsrc/devel/xulrunner$ cat 
patches/patch-js_src_Makefile.in
$NetBSD$

--- js/src/Makefile.in.orig     2012-11-19 15:42:30.000000000 +0000
+++ js/src/Makefile.in
@@ -516,7 +516,7 @@ endif
 # don't give different results. We skip the contents of objdirs using 
|find|
 # (it can't be done with %-expansion, because the files we want to 
skip aren't
 # in the vpath).
-ALL_FILES=$(shell find $(srcdir) \( -name "*.cpp" -o -name "*.h" \) ! 
-path "*/dist/*" ! -path "*/config/*")
+ALL_FILES=$(shell find $(srcdir) ! \( -type d -name "dist" -o -name 
"config" -prune \) -name "*.cpp" -o -name "*.h")
 check-malloc-function-usage: $(filter-out %jsalloc.h %jscntxt.h 
%jsutil.h, $(ALL_FILES))

        # js_malloc and friends are only used by other memory managers, 
and should
@@ -670,6 +670,9 @@ endif # _MSC_VER
 ifeq ($(OS_ARCH),FreeBSD)
 EXTRA_LIBS     += -pthread
 endif
+ifeq ($(OS_ARCH),DragonFly)
+EXTRA_LIBS     += -pthread
+endif
 ifeq ($(OS_ARCH),Linux)
 EXTRA_LIBS     += -ldl
 endif

Attachment: find-patch.log.gz
Description: GNU Zip compressed data