diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-10 10:41:12 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-10 10:41:12 +0200 |
| commit | 5f0638d8ceb08b8dcfae4857989468bd3ecbdeea (patch) | |
| tree | d2402a602c7230529a07c681e4bcb46717e6096f /package/orbit2 | |
| parent | ce9b4aa7829ac5405ad6f18af75c3d8d204828c2 (diff) | |
| parent | 052c8c9fdcadd52f9eecc4de036b7afdf7f4942f (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/orbit2')
| -rw-r--r-- | package/orbit2/Makefile | 5 | ||||
| -rw-r--r-- | package/orbit2/patches/patch-Makefile_in | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile index 03e7cc974..3713ad403 100644 --- a/package/orbit2/Makefile +++ b/package/orbit2/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= ORBit2 PKG_VERSION:= 2.14.19 PKG_EXTRAVER:= 2.14 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 87c69c56c6d0bdafa4de5e18ae115cc9 PKG_DESCR:= a CORBA 2.4-compliant Object Request Broker PKG_SECTION:= libs @@ -14,7 +14,7 @@ PKG_BUILDDEP:= libIDL PKG_URL:= http://projects.gnome.org/ORBit2/ PKG_SITES:= ftp://ftp.gnome.org//pub/gnome/sources/ORBit2/${PKG_EXTRAVER}/ -PKG_ARCH_DEPENDS:= !arm !cris +PKG_ARCH_DEPENDS:= !cris PKG_SUBPKGS:= ORBIT2 ORBIT2_DEV PKGSD_ORBIT2_DEV:= orbit2 headers @@ -26,7 +26,6 @@ $(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP $(eval $(call PKG_template,ORBIT2_DEV,orbit2-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ORBIT2_DEV},${PKGSC_ORBIT2_DEV})) CFLAGS_FOR_BUILD+= $(shell ${BUILD_LIBIDL_CONFIG} --cflags) -CFLAGS_FOR_BUILD+= -I/usr/local/include -I/usr/include LDFLAGS_FOR_BUILD+= $(shell ${BUILD_LIBIDL_CONFIG} --libs) LDFLAGS_FOR_BUILD+= -lgmodule-2.0 CONFIGURE_ENV+= ac_cv_alignof_CORBA_octet=1 \ diff --git a/package/orbit2/patches/patch-Makefile_in b/package/orbit2/patches/patch-Makefile_in new file mode 100644 index 000000000..6db688b9d --- /dev/null +++ b/package/orbit2/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- ORBit2-2.14.19.orig/Makefile.in 2010-09-28 11:39:41.000000000 +0200 ++++ ORBit2-2.14.19/Makefile.in 2013-10-10 10:22:00.000000000 +0200 +@@ -296,7 +296,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc +-SUBDIRS = linc2 src include test docs ++SUBDIRS = linc2 src include docs + bin_SCRIPTS = orbit2-config + EXTRA_DIST = \ + ORBit2.m4 \ |