From b4d204f9fdb09a3655ae9a90ef262e253d6e59d7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 10 Jan 2014 17:37:30 +0100 Subject: add upower, polkit and dependencies --- package/mozjs/Makefile | 33 +++++++++++++++++ package/mozjs/patches/patch-js_src_configure | 42 ++++++++++++++++++++++ package/mozjs/patches/patch-js_src_js_pc_in | 12 +++++++ .../patches/patch-js_src_methodjit_MethodJIT_cpp | 22 ++++++++++++ 4 files changed, 109 insertions(+) create mode 100644 package/mozjs/Makefile create mode 100644 package/mozjs/patches/patch-js_src_configure create mode 100644 package/mozjs/patches/patch-js_src_js_pc_in create mode 100644 package/mozjs/patches/patch-js_src_methodjit_MethodJIT_cpp (limited to 'package/mozjs') diff --git a/package/mozjs/Makefile b/package/mozjs/Makefile new file mode 100644 index 000000000..c5e41f489 --- /dev/null +++ b/package/mozjs/Makefile @@ -0,0 +1,33 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= mozjs +PKG_VERSION:= 17.0.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 20b6f8f1140ef6e47daa3b16965c9202 +PKG_DESCR:= javascript library +PKG_SECTION:= libs +PKG_BUILDDEP:= bzip2-host python2-host nspr +PKG_SITES:= http://ftp.mozilla.org/pub/mozilla.org/js/ +PKG_OPTS:= dev + +DISTFILES:= ${PKG_NAME}${PKG_VERSION}.tar.gz +WRKDIST= ${WRKDIR}/${PKG_NAME}${PKG_VERSION} +WRKSRC= ${WRKDIST}/js/src + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,MOZJS,mozjs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +CONFIGURE_ENV+= HOST_CC="${CC_FOR_BUILD}" HOST_CFLAGS="${CFLAGS_FOR_BUILD}" HOST_CXX="${CXX_FOR_BUILD}" +CONFIGURE_ARGS+= --disable-optimize \ + --with-system-nspr + +mozjs-install: + $(INSTALL_DIR) $(IDIR_MOZJS)/usr/lib + $(CP) $(WRKINST)/usr/lib/libmozjs*.so* \ + $(IDIR_MOZJS)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/mozjs/patches/patch-js_src_configure b/package/mozjs/patches/patch-js_src_configure new file mode 100644 index 000000000..f2b4f62c4 --- /dev/null +++ b/package/mozjs/patches/patch-js_src_configure @@ -0,0 +1,42 @@ +--- mozjs17.0.0.orig/js/src/configure 2013-03-25 21:34:20.000000000 +0100 ++++ mozjs17.0.0/js/src/configure 2014-01-09 18:00:47.000000000 +0100 +@@ -6037,39 +6037,6 @@ EOF + HAVE_ARM_SIMD=1 + fi + +- echo $ac_n "checking for ARM NEON support in compiler""... $ac_c" 1>&6 +-echo "configure:6042: checking for ARM NEON support in compiler" >&5 +- # We try to link so that this also fails when +- # building with LTO. +- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- result="yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- result="no" +-fi +-rm -f conftest* +- echo "$ac_t"""$result"" 1>&6 +- if test "$result" = "yes"; then +- cat >> confdefs.pytmp <<\EOF +- (''' HAVE_ARM_NEON ''', ' 1 ') +-EOF +-cat >> confdefs.h <<\EOF +-#define HAVE_ARM_NEON 1 +-EOF +- +- HAVE_ARM_NEON=1 +- fi + fi # CPU_ARCH = arm + + diff --git a/package/mozjs/patches/patch-js_src_js_pc_in b/package/mozjs/patches/patch-js_src_js_pc_in new file mode 100644 index 000000000..456678abe --- /dev/null +++ b/package/mozjs/patches/patch-js_src_js_pc_in @@ -0,0 +1,12 @@ +--- mozjs17.0.0.orig/js/src/js.pc.in 2013-03-25 21:34:20.000000000 +0100 ++++ mozjs17.0.0/js/src/js.pc.in 2014-01-10 10:18:19.000000000 +0100 +@@ -1,7 +1,7 @@ + #filter substitution + prefix=@prefix@ +-libdir=@libdir@ +-includedir=@includedir@ ++libdir=${prefix}/lib ++includedir=${prefix}/include + + Name: SpiderMonkey @MOZILLA_VERSION@ + Description: The Mozilla library for JavaScript diff --git a/package/mozjs/patches/patch-js_src_methodjit_MethodJIT_cpp b/package/mozjs/patches/patch-js_src_methodjit_MethodJIT_cpp new file mode 100644 index 000000000..a347a7077 --- /dev/null +++ b/package/mozjs/patches/patch-js_src_methodjit_MethodJIT_cpp @@ -0,0 +1,22 @@ +--- mozjs17.0.0.orig/js/src/methodjit/MethodJIT.cpp 2013-02-11 23:33:23.000000000 +0100 ++++ mozjs17.0.0/js/src/methodjit/MethodJIT.cpp 2014-01-09 18:10:13.000000000 +0100 +@@ -702,7 +702,8 @@ asm ( + FUNCTION_HEADER_EXTRA + ".globl " SYMBOL_STRING(JaegerTrampolineReturn) "\n" + SYMBOL_STRING(JaegerTrampolineReturn) ":" "\n" +-" strd r4, r5, [r10, #24]" "\n" /* fp->rval type,data */ ++" str r4, [r10, #24]" "\n" /* fp->rval type,data */ ++" str r5, [r10, #28]" "\n" /* fp->rval type,data */ + + /* Tidy up. */ + " mov r0, sp" "\n" +@@ -762,7 +763,8 @@ SYMBOL_STRING(JaegerInterpoline) ":" + " blx " SYMBOL_STRING_RELOC(js_InternalInterpret) "\n" + " cmp r0, #0" "\n" + " ldr r10, [sp, #(4*7)]" "\n" /* Load (StackFrame*)f->regs->fp_ */ +-" ldrd r4, r5, [r10, #(4*6)]" "\n" /* Load rval payload and type. */ ++" ldr r4, [r10, #(4*6)]" "\n" /* Load rval payload and type. */ ++" ldr r5, [r10, #((4*6)+4)]" "\n" /* Load rval payload and type. */ + " ldr r1, [sp, #(4*3)]" "\n" /* Load scratch. */ + " it ne" "\n" + " bxne r0" "\n" -- cgit v1.2.3 From 39c0b868f4e02d716a7e5f74915f9b00b81a4569 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 10 Jan 2014 19:19:25 +0100 Subject: fix compile, set HOST_CXXFLAGS, too --- package/mozjs/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'package/mozjs') diff --git a/package/mozjs/Makefile b/package/mozjs/Makefile index c5e41f489..e7c7a0034 100644 --- a/package/mozjs/Makefile +++ b/package/mozjs/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= mozjs PKG_VERSION:= 17.0.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 20b6f8f1140ef6e47daa3b16965c9202 PKG_DESCR:= javascript library PKG_SECTION:= libs @@ -21,7 +21,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,MOZJS,mozjs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CONFIGURE_ENV+= HOST_CC="${CC_FOR_BUILD}" HOST_CFLAGS="${CFLAGS_FOR_BUILD}" HOST_CXX="${CXX_FOR_BUILD}" +CONFIGURE_ENV+= HOST_CC="${CC_FOR_BUILD}" HOST_CFLAGS="${CFLAGS_FOR_BUILD}" +CONFIGURE_ENV+= HOST_CXXFLAGS="${CXXFLAGS_FOR_BUILD}" HOST_CXX="${CXX_FOR_BUILD}" CONFIGURE_ARGS+= --disable-optimize \ --with-system-nspr -- cgit v1.2.3 From 7ce924b1f5ab24a0f16293047c67d24c6376d375 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 11 Jan 2014 11:50:34 +0100 Subject: systemd is glibc specific, disable upower/polkit for uclibc/musl for now --- package/mozjs/Makefile | 1 + package/polkit/Makefile | 6 ++-- package/polkit/patches/patch-configure_ac | 11 ++++++- ...lkitbackend_polkitbackendinteractiveauthority_c | 31 ++++++++++++++++++ ...ch-src_polkitbackend_polkitbackendjsauthority_c | 38 ++++++++++++++++++++++ package/upower/Makefile | 2 ++ 6 files changed, 86 insertions(+), 3 deletions(-) create mode 100644 package/polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority_c create mode 100644 package/polkit/patches/patch-src_polkitbackend_polkitbackendjsauthority_c (limited to 'package/mozjs') diff --git a/package/mozjs/Makefile b/package/mozjs/Makefile index e7c7a0034..3d08b64cf 100644 --- a/package/mozjs/Makefile +++ b/package/mozjs/Makefile @@ -22,6 +22,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,MOZJS,mozjs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIGURE_ENV+= HOST_CC="${CC_FOR_BUILD}" HOST_CFLAGS="${CFLAGS_FOR_BUILD}" +CONFIGURE_ENV+= HOST_LDFLAGS="${LDFLAGS_FOR_BUILD}" CONFIGURE_ENV+= HOST_CXXFLAGS="${CXXFLAGS_FOR_BUILD}" HOST_CXX="${CXX_FOR_BUILD}" CONFIGURE_ARGS+= --disable-optimize \ --with-system-nspr diff --git a/package/polkit/Makefile b/package/polkit/Makefile index 3470d2737..0fbfcb439 100644 --- a/package/polkit/Makefile +++ b/package/polkit/Makefile @@ -6,15 +6,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:= polkit PKG_VERSION:= 0.112 PKG_RELEASE:= 2 -PKG_MD5SUM:= 9fa7a28633b028681163466da898b008 +PKG_MD5SUM:= 23973dcfd8b92ab2b7db3a925642b76d PKG_DESCR:= application-level toolkit PKG_SECTION:= libs PKG_BUILDDEP:= autotool mozjs PKG_DEPENDS:= mozjs PKG_URL:= http://www.freedesktop.org/wiki/Software/polkit/ -PKG_SITES:= http://cgit.freedesktop.org/polkit/snapshot/ +PKG_SITES:= http://openadk.org/distfiles/ PKG_OPTS:= dev +PKG_LIBC_DEPENDS:= eglibc glibc + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,POLKIT,polkit,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/polkit/patches/patch-configure_ac b/package/polkit/patches/patch-configure_ac index 3b258e7f4..65681615d 100644 --- a/package/polkit/patches/patch-configure_ac +++ b/package/polkit/patches/patch-configure_ac @@ -1,5 +1,5 @@ --- polkit-0.112.orig/configure.ac 2013-09-18 18:55:09.000000000 +0200 -+++ polkit-0.112/configure.ac 2014-01-09 21:28:57.000000000 +0100 ++++ polkit-0.112/configure.ac 2014-01-11 11:22:30.000000000 +0100 @@ -8,9 +8,6 @@ AM_MAINTAINER_MODE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -19,6 +19,15 @@ #### gcc warning flags if test "x$GCC" = "xyes"; then +@@ -158,7 +153,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXP + [AC_MSG_ERROR([Can't find expat library. Please install expat.])]) + AC_SUBST(EXPAT_LIBS) + +-AC_CHECK_FUNCS(clearenv) ++AC_CHECK_FUNCS(clearenv getnetgrent innetgr) + + if test "x$GCC" = "xyes"; then + LDFLAGS="-Wl,--as-needed $LDFLAGS" @@ -476,8 +471,6 @@ case "$host_os" in ;; esac diff --git a/package/polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority_c b/package/polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority_c new file mode 100644 index 000000000..64608f5b5 --- /dev/null +++ b/package/polkit/patches/patch-src_polkitbackend_polkitbackendinteractiveauthority_c @@ -0,0 +1,31 @@ +--- polkit-0.112.orig/src/polkitbackend/polkitbackendinteractiveauthority.c 2013-09-18 18:55:09.000000000 +0200 ++++ polkit-0.112/src/polkitbackend/polkitbackendinteractiveauthority.c 2014-01-11 11:22:30.000000000 +0100 +@@ -2103,6 +2103,7 @@ get_users_in_group (PolkitIdentity + return ret; + } + ++#if defined(HAVE_GETNETGRENT) + static GList * + get_users_in_net_group (PolkitIdentity *group, + gboolean include_root) +@@ -2154,6 +2155,7 @@ get_users_in_net_group (PolkitIdentity + endnetgrent (); + return ret; + } ++#endif + + /* ---------------------------------------------------------------------------------------------------- */ + +@@ -2243,10 +2245,12 @@ authentication_agent_initiate_challenge + { + user_identities = g_list_concat (user_identities, get_users_in_group (identity, FALSE)); + } ++#if defined(HAVE_GETNETGRENT) + else if (POLKIT_IS_UNIX_NETGROUP (identity)) + { + user_identities = g_list_concat (user_identities, get_users_in_net_group (identity, FALSE)); + } ++#endif + else + { + g_warning ("Unsupported identity"); diff --git a/package/polkit/patches/patch-src_polkitbackend_polkitbackendjsauthority_c b/package/polkit/patches/patch-src_polkitbackend_polkitbackendjsauthority_c new file mode 100644 index 000000000..14a702dda --- /dev/null +++ b/package/polkit/patches/patch-src_polkitbackend_polkitbackendjsauthority_c @@ -0,0 +1,38 @@ +--- polkit-0.112.orig/src/polkitbackend/polkitbackendjsauthority.c 2013-09-18 18:55:09.000000000 +0200 ++++ polkit-0.112/src/polkitbackend/polkitbackendjsauthority.c 2014-01-11 11:27:02.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + #include + #include "polkitbackendjsauthority.h" +@@ -1450,13 +1451,16 @@ js_polkit_user_is_in_netgroup (JSContext + JSBool ret = JS_FALSE; + JSString *user_str; + JSString *netgroup_str; +- char *user; +- char *netgroup; + JSBool is_in_netgroup = JS_FALSE; + + if (!JS_ConvertArguments (cx, argc, JS_ARGV (cx, vp), "SS", &user_str, &netgroup_str)) + goto out; + ++#if defined(HAVE_INNETGR) ++ { ++ char *user; ++ char *netgroup; ++ + user = JS_EncodeString (cx, user_str); + netgroup = JS_EncodeString (cx, netgroup_str); + +@@ -1470,6 +1474,8 @@ js_polkit_user_is_in_netgroup (JSContext + + JS_free (cx, netgroup); + JS_free (cx, user); ++ } ++#endif + + ret = JS_TRUE; + diff --git a/package/upower/Makefile b/package/upower/Makefile index c62878716..adf317802 100644 --- a/package/upower/Makefile +++ b/package/upower/Makefile @@ -14,6 +14,8 @@ PKG_DEPENDS:= glib dbus-glib polkit libgudev PKG_URL:= http://upower.freedesktop.org/ PKG_SITES:= http://upower.freedesktop.org/releases/ +PKG_LIBC_DEPENDS:= eglibc glibc + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz include $(TOPDIR)/mk/package.mk -- cgit v1.2.3