diff options
| -rw-r--r-- | package/MesaLib/patches/patch-bin_mklib | 77 | ||||
| -rw-r--r-- | package/firefox/Makefile | 2 | ||||
| -rw-r--r-- | package/fontconfig/Makefile | 1 | ||||
| -rw-r--r-- | package/glib/patches/patch-gio_Makefile_in | 34 |
4 files changed, 70 insertions, 44 deletions
diff --git a/package/MesaLib/patches/patch-bin_mklib b/package/MesaLib/patches/patch-bin_mklib index f198b424d..6882933fb 100644 --- a/package/MesaLib/patches/patch-bin_mklib +++ b/package/MesaLib/patches/patch-bin_mklib @@ -1,46 +1,37 @@ --- Mesa-7.8.2.orig/bin/mklib 2010-06-15 19:43:41.000000000 +0200 -+++ Mesa-7.8.2/bin/mklib 2010-12-04 23:25:12.000000000 +0100 -@@ -49,8 +49,8 @@ expand_archives() { - /*) ;; - *) FILE="$ORIG_DIR/$FILE" ;; - esac -- MEMBERS=`ar t $FILE` -- ar x $FILE -+ MEMBERS=`${AR} t $FILE` -+ ${AR} x $FILE - for MEMBER in $MEMBERS ; do - NEWFILES="$NEWFILES $DIR/$MEMBER" - done -@@ -77,7 +77,7 @@ expand_archives() { - make_ar_static_lib() { - OPTS=$1 - shift; -- RANLIB=$1 -+ RAN=$1 - shift; - LIBNAME=$1 - shift; -@@ -87,11 +87,11 @@ make_ar_static_lib() { - rm -f ${LIBNAME} - - # make static lib -- ar ${OPTS} ${LIBNAME} ${OBJECTS} -+ ${AR} ${OPTS} ${LIBNAME} ${OBJECTS} - - # run ranlib -- if [ ${RANLIB} = 1 ] ; then -- ranlib ${LIBNAME} -+ if [ ${RAN} = 1 ] ; then -+ ${RANLIB} ${LIBNAME} - fi - - echo ${LIBNAME} -@@ -251,7 +251,7 @@ OBJECTS=$@ - - - if [ ${ARCH} = "auto" ] ; then -- ARCH=`uname` -+ ARCH=Linux - fi ++++ Mesa-7.8.2/bin/mklib 2013-02-12 13:27:53.000000000 +0100 +@@ -333,10 +333,6 @@ case $ARCH in + # Check if objects are 32-bit and we're running in 64-bit + # environment. If so, pass -m32 flag to linker. + set ${OBJECTS} +- ABI32=`file $1 | grep 32-bit` +- if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then +- OPTS="-m32 ${OPTS}" +- fi + if [ "${ALTOPTS}" ] ; then + OPTS=${ALTOPTS} +@@ -390,10 +386,6 @@ case $ARCH in + # Check if objects are 32-bit and we're running in 64-bit + # environment. If so, pass -m32 flag to linker. + set ${OBJECTS} +- ABI32=`file $1 | grep 32-bit` +- if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then +- OPTS="-m32 ${OPTS}" +- fi + if [ "${ALTOPTS}" ] ; then + OPTS=${ALTOPTS} + fi +@@ -462,12 +454,6 @@ case $ARCH in + # Check if objects are 32-bit and we're running in 64-bit + # environment. If so, pass -m32 flag to linker. + set ${OBJECTS} +- ABI32=`file $1 | grep 32-bit` +- if [ "${ABI32}" ] ; then +- OPTS="-m32 -shared -Wl,-Bdynamic" +- else +- OPTS="-m64 -shared -Wl,-Bdynamic" +- fi + fi + # If using Sun C++ compiler, need to tell it not to add runpaths diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 6c021f3e0..fbd2f2619 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -22,7 +22,7 @@ PKG_NEED_CXX:= 1 PKG_ARCH_DEPENDS:= x86 x86_64 native mips PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin -PKG_SYSTEM_DEPENDS:= tarox-pc ibm-x40 lemote-yeelong qemu-i686 qemu-x86_64 +PKG_SYSTEM_DEPENDS:= tarox-pc ibm-x40 lemote-yeelong qemu-i686 qemu-x86_64 qemu-mips64el DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 WRKDIST= ${WRKDIR}/mozilla-release diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile index a6aba2311..72e996001 100644 --- a/package/fontconfig/Makefile +++ b/package/fontconfig/Makefile @@ -30,6 +30,7 @@ $(eval $(call PKG_template,FONTCONFIG_DEV,fontconfig-dev,${PKG_VERSION}-${PKG_RE TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) TARGET_LDFLAGS+= -liconv CONFIGURE_ARGS+= --with-arch=${ARCH} \ + --enable-libxml2 \ --disable-docs fontconfig-install: diff --git a/package/glib/patches/patch-gio_Makefile_in b/package/glib/patches/patch-gio_Makefile_in new file mode 100644 index 000000000..0bc0dbdc5 --- /dev/null +++ b/package/glib/patches/patch-gio_Makefile_in @@ -0,0 +1,34 @@ +--- glib-2.35.7.orig/gio/Makefile.in 2013-02-05 21:44:27.000000000 +0100 ++++ glib-2.35.7/gio/Makefile.in 2013-02-12 12:07:43.000000000 +0100 +@@ -1291,6 +1291,7 @@ DISTCLEANFILES = \ + glib_compile_resources_LDADD = \ + $(top_builddir)/glib/libglib-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la \ ++ $(top_builddir)/gmodule/libgmodule-2.0.la \ + libgio-2.0.la + + glib_compile_resources_SOURCES = \ +@@ -1318,6 +1319,7 @@ glib_compile_schemas_SOURCES = \ + gsettings_LDADD = \ + $(top_builddir)/glib/libglib-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la \ ++ $(top_builddir)/gmodule/libgmodule-2.0.la \ + libgio-2.0.la + + gsettings_SOURCES = gsettings-tool.c +@@ -1326,6 +1328,7 @@ dist_schema_DATA = gschema.dtd + gdbus_SOURCES = gdbus-tool.c + gdbus_LDADD = libgio-2.0.la \ + $(top_builddir)/glib/libglib-2.0.la \ ++ $(top_builddir)/gmodule/libgmodule-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la + + completiondir = $(datadir)/bash-completion/completions +@@ -1338,6 +1341,7 @@ gresource_SOURCES = gresource-tool.c + gresource_CPPFLAGS = $(LIBELF_CFLAGS) $(AM_CPPFLAGS) + gresource_LDADD = libgio-2.0.la \ + $(top_builddir)/glib/libglib-2.0.la \ ++ $(top_builddir)/gmodule/libgmodule-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la \ + $(LIBELF_LIBS) + |