diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-22 20:00:07 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-22 20:00:07 +0200 |
| commit | f59297dd236b2892205e28c734eb585587651532 (patch) | |
| tree | fd6a4ec5629a644b8beceed3fb67de2608744ff9 /package | |
| parent | fb12cc0a7bb293e31e7064f5a64d6cbe0c5447dc (diff) | |
| parent | 9f21d9bd78d5a8269e72cf5c230207e1b3961b9a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/classpath/Makefile | 1 | ||||
| -rw-r--r-- | package/glib/Makefile | 7 | ||||
| -rw-r--r-- | package/orbit2/Makefile | 1 | ||||
| -rw-r--r-- | package/xfsprogs/Makefile | 3 |
4 files changed, 8 insertions, 4 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 \ diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile index 2af6fc389..a5b49b895 100644 --- a/package/xfsprogs/Makefile +++ b/package/xfsprogs/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= xfsprogs PKG_VERSION:= 3.1.5 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= b1db37749e2b4149a0dd178abff956be PKG_DESCR:= Utilities for XFS filesystems PKG_SECTION:= fs @@ -32,5 +32,6 @@ do-install: ${INSTALL_DIR} ${IDIR_XFSPROGS}/usr/sbin ${INSTALL_BIN} ${WRKBUILD}/mkfs/mkfs.xfs ${IDIR_XFSPROGS}/usr/sbin ${INSTALL_BIN} ${WRKBUILD}/repair/xfs_repair ${IDIR_XFSPROGS}/usr/sbin + ${INSTALL_BIN} ${WRKBUILD}/growfs/xfs_growfs ${IDIR_XFSPROGS}/usr/sbin include ${TOPDIR}/mk/pkg-bottom.mk |