From ca68bf14a3b7f6406599308174e959b5b312bef3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 22 Oct 2011 18:39:39 +0200 Subject: some more FreeBSD fixes --- package/classpath/Makefile | 1 + package/glib/Makefile | 7 ++++--- package/orbit2/Makefile | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'package') 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 \ -- cgit v1.2.3