diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-15 13:09:33 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-15 13:13:14 +0200 |
| commit | bf8903fa567e5c1b5d923c6f1c0aeb1d2fd1192a (patch) | |
| tree | 64691c16412c4788e2f242abeb418187231d0ec8 /package/orbit2 | |
| parent | bf3ec139fd4c0996463d221478eb8ce82694e6de (diff) | |
cleanup HOST_STYLE, use SYSROOT feature for pkgconf
there are three HOST_STYLE's, not set mean fully automatic installation.
auto means prefix is set to /usr and DESTDIR is set to STAGING_HOST_DIR.
When using manual, you need to provide your own targets.
Instead of using sed to modify *.pc files, use PKG_SYSROOT feature, which does
work better and avoids pathcing some pc files. Idea from sh4rm via #musl.
Diffstat (limited to 'package/orbit2')
| -rw-r--r-- | package/orbit2/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile index f5dd70105..745a6e11f 100644 --- a/package/orbit2/Makefile +++ b/package/orbit2/Makefile @@ -18,13 +18,14 @@ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +include $(TOPDIR)/mk/host.mk 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) +CFLAGS_FOR_BUILD+= $(shell env $(HOST_CONFIGURE_ENV) libIDL-config-2 --cflags) LDFLAGS_FOR_BUILD+= -static -LIBS_FOR_BUILD:= $(shell PATH=$(HOST_PATH) libIDL-config-2 --libs) +LIBS_FOR_BUILD:= $(shell env $(HOST_CONFIGURE_ENV) 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 \ @@ -49,4 +50,5 @@ orbit2-install: $(CP) $(WRKINST)/usr/bin/orbit-idl-2 \ $(STAGING_TARGET_DIR)/usr/bin +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk |