diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
| commit | 8e8512391c668fc7074f812f15eabe8f176fb01e (patch) | |
| tree | f9f0862dd6eb962fe3fc4803180b431843f6c5be /package/orbit2/Makefile | |
| parent | c491653a1f9574a42965025805d472c3d145f699 (diff) | |
| parent | ae3d4616ed9c19a29d656193254657f93d612fa2 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/orbit2/Makefile')
| -rw-r--r-- | package/orbit2/Makefile | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile index 3713ad403..618841d7d 100644 --- a/package/orbit2/Makefile +++ b/package/orbit2/Makefile @@ -6,27 +6,24 @@ include $(TOPDIR)/rules.mk PKG_NAME:= ORBit2 PKG_VERSION:= 2.14.19 PKG_EXTRAVER:= 2.14 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 87c69c56c6d0bdafa4de5e18ae115cc9 PKG_DESCR:= a CORBA 2.4-compliant Object Request Broker PKG_SECTION:= libs -PKG_BUILDDEP:= libIDL +PKG_BUILDDEP:= gettext-tiny glib-host libIDL-host libIDL PKG_URL:= http://projects.gnome.org/ORBit2/ PKG_SITES:= ftp://ftp.gnome.org//pub/gnome/sources/ORBit2/${PKG_EXTRAVER}/ +PKG_LIBNAME:= orbit2 +PKG_OPTS:= dev PKG_ARCH_DEPENDS:= !cris -PKG_SUBPKGS:= ORBIT2 ORBIT2_DEV -PKGSD_ORBIT2_DEV:= orbit2 headers -PKGSC_ORBIT2_DEV:= devel - include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,ORBIT2_DEV,orbit2-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ORBIT2_DEV},${PKGSC_ORBIT2_DEV})) +$(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CFLAGS_FOR_BUILD+= $(shell ${BUILD_LIBIDL_CONFIG} --cflags) -LDFLAGS_FOR_BUILD+= $(shell ${BUILD_LIBIDL_CONFIG} --libs) +CFLAGS_FOR_BUILD+= $(shell PATH=$(TARGET_PATH) libIDL-config-2 --cflags) +LDFLAGS_FOR_BUILD+= $(shell PATH=$(TARGET_PATH) libIDL-config-2 --libs) LDFLAGS_FOR_BUILD+= -lgmodule-2.0 CONFIGURE_ENV+= ac_cv_alignof_CORBA_octet=1 \ ac_cv_alignof_CORBA_boolean=1 \ @@ -53,12 +50,4 @@ orbit2-install: $(CP) $(WRKINST)/usr/bin/orbit-idl-2 \ $(STAGING_DIR)/usr/bin -orbit2-dev-install: - $(INSTALL_DIR) $(IDIR_ORBIT2_DEV)/usr/include - $(CP) $(WRKINST)/usr/include/* \ - $(IDIR_ORBIT2_DEV)/usr/include - $(INSTALL_DIR) $(IDIR_ORBIT2_DEV)/usr/lib/pkgconfig - $(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \ - $(IDIR_ORBIT2_DEV)/usr/lib/pkgconfig - include ${TOPDIR}/mk/pkg-bottom.mk |