diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-22 19:26:20 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-22 19:26:20 +0200 |
| commit | 16d5b9facce817a1f389543082176e87bd7b92ea (patch) | |
| tree | 82e0e6dcc5b56326ef1f14c24f0336962225ded3 | |
| parent | d9cd3aca2bf0689374fc71227dd42f629209b868 (diff) | |
| parent | a6717421b7e4ed1631bd8e310881f76c0ba1b0fa (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/classpath/Makefile | 1 | ||||
| -rw-r--r-- | package/glib/Makefile | 7 | ||||
| -rw-r--r-- | package/orbit2/Makefile | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/package/classpath/Makefile b/package/classpath/Makefile index 2a9199e55..e63c84e7a 100644 --- a/package/classpath/Makefile +++ b/package/classpath/Makefile @@ -14,6 +14,7 @@ PKG_DEPENDS:= libgtk gdk-pixbuf orbit2 gconf PKG_URL:= http://www.gnu.org/software/classpath/home.html PKG_SITES:= ${MASTER_SITE_GNU:=classpath/} +PKG_HOST_DEPENDS:= linux PKG_ARCH_DEPENDS:= !cris !arm include $(TOPDIR)/mk/package.mk diff --git a/package/glib/Makefile b/package/glib/Makefile index 692e5c8af..a5df0225f 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -43,10 +43,11 @@ CONFIGURE_ENV+= glib_cv_long_long_format=ll \ ac_cv_func_posix_getgrgid_r=yes pre-configure: -ifneq ($(OStype),Darwin) +ifneq ($(OStype),FreeBSD) (cd ${WRKBUILD}; rm -rf config.{cache,status}; \ - ./configure --prefix=$(STAGING_HOST_DIR) \ - ); + CFLAGS="-L/usr/local/lib" ./configure --prefix=$(STAGING_HOST_DIR) \ + --with-libiconv=gnu \ + ) ${MAKE} -C ${WRKBUILD} V=1 $(CP) ${WRKBUILD}/gio/.libs/glib-compile-schemas ${STAGING_HOST_DIR}/bin $(CP) ${WRKBUILD}/gobject/.libs/glib-genmarshal ${STAGING_HOST_DIR}/bin diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile index 81317669d..c30fa35ed 100644 --- a/package/orbit2/Makefile +++ b/package/orbit2/Makefile @@ -26,6 +26,7 @@ $(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 LDFLAGS_FOR_BUILD+= $(shell ${BUILD_LIBIDL_CONFIG} --libs) LDFLAGS_FOR_BUILD+= -lgmodule-2.0 CONFIGURE_ENV+= ac_cv_alignof_CORBA_octet=1 \ |