summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/glib/Makefile3
-rw-r--r--package/orbit2/Makefile10
-rw-r--r--package/orbit2/patches/patch-src_idl-compiler_Makefile_in11
3 files changed, 18 insertions, 6 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile
index e1ce6bca4..2c82f8a53 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= glib
PKG_VERSION:= 2.38.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_EXTRAVER:= 2.38
PKG_MD5SUM:= 26d1d08e478fc48c181ca8be44f5b69f
PKG_DESCR:= low-level core library that forms the basis of GTK+
@@ -44,6 +44,7 @@ CONFIGURE_ENV+= glib_cv_long_long_format=ll \
ac_cv_func_posix_getgrgid_r=yes
HOST_CONFIGURE_ARGS+= --disable-fam \
+ --enable-static \
--disable-compile-warnings
glib-install:
diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile
index 4f656ea59..d256095f8 100644
--- a/package/orbit2/Makefile
+++ b/package/orbit2/Makefile
@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= ORBit2
PKG_VERSION:= 2.14.19
PKG_EXTRAVER:= 2.14
-PKG_RELEASE:= 4
+PKG_RELEASE:= 5
PKG_MD5SUM:= 87c69c56c6d0bdafa4de5e18ae115cc9
PKG_DESCR:= a CORBA 2.4-compliant Object Request Broker
PKG_SECTION:= libs
-PKG_BUILDDEP:= gettext-tiny glib-host libIDL-host libIDL
+PKG_BUILDDEP:= gettext-tiny glib-host libIDL-host glib libIDL
PKG_URL:= http://projects.gnome.org/ORBit2/
PKG_SITES:= ftp://ftp.gnome.org//pub/gnome/sources/ORBit2/${PKG_EXTRAVER}/
PKG_LIBNAME:= orbit2
@@ -21,8 +21,10 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CFLAGS_FOR_BUILD+= $(shell PATH=$(HOST_PATH) libIDL-config-2 --cflags)
-LDFLAGS_FOR_BUILD+= $(shell PATH=$(HOST_PATH) libIDL-config-2 --libs)
-LDFLAGS_FOR_BUILD+= -lgmodule-2.0
+LDFLAGS_FOR_BUILD+= -static
+LIBS_FOR_BUILD:= $(shell PATH=$(HOST_PATH) libIDL-config-2 --libs)
+LIBS_FOR_BUILD+= -lgmodule-2.0 -ldl -lpthread -lrt -lglib-2.0
+XAKE_FLAGS+= LIBS_FOR_BUILD="${LIBS_FOR_BUILD}"
CONFIGURE_ENV+= ac_cv_alignof_CORBA_octet=1 \
ac_cv_alignof_CORBA_boolean=1 \
ac_cv_alignof_CORBA_char=1 \
diff --git a/package/orbit2/patches/patch-src_idl-compiler_Makefile_in b/package/orbit2/patches/patch-src_idl-compiler_Makefile_in
index ec73ef4f3..f46b6169b 100644
--- a/package/orbit2/patches/patch-src_idl-compiler_Makefile_in
+++ b/package/orbit2/patches/patch-src_idl-compiler_Makefile_in
@@ -1,5 +1,5 @@
--- ORBit2-2.14.19.orig/src/idl-compiler/Makefile.in 2010-09-28 11:39:39.000000000 +0200
-+++ ORBit2-2.14.19/src/idl-compiler/Makefile.in 2011-03-25 20:28:46.000000000 +0100
++++ ORBit2-2.14.19/src/idl-compiler/Makefile.in 2014-03-15 20:45:12.000000000 +0100
@@ -66,15 +66,13 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -43,3 +43,12 @@
orbit_idl_2_LDADD = \
$(ORBIT_IDL_LIBS) \
+@@ -383,7 +380,7 @@ clean-binPROGRAMS:
+ rm -f $$list
+ orbit-idl-2$(EXEEXT): $(orbit_idl_2_OBJECTS) $(orbit_idl_2_DEPENDENCIES)
+ @rm -f orbit-idl-2$(EXEEXT)
+- $(LINK) $(orbit_idl_2_OBJECTS) $(orbit_idl_2_LDADD) $(LIBS)
++ $(LINK) $(orbit_idl_2_OBJECTS) $(orbit_idl_2_LDADD) $(LIBS) $(LIBS_FOR_BUILD)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)