summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/cryptsetup/patches/patch-aclocal_m426
-rw-r--r--package/file/Makefile1
-rw-r--r--package/nspr/Makefile2
3 files changed, 1 insertions, 28 deletions
diff --git a/package/cryptsetup/patches/patch-aclocal_m4 b/package/cryptsetup/patches/patch-aclocal_m4
deleted file mode 100644
index 4d3ef4bff..000000000
--- a/package/cryptsetup/patches/patch-aclocal_m4
+++ /dev/null
@@ -1,26 +0,0 @@
---- cryptsetup-1.1.0.orig/aclocal.m4 2010-01-17 11:29:20.000000000 +0100
-+++ cryptsetup-1.1.0/aclocal.m4 2010-02-16 20:32:36.840860169 +0100
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.11 -*- Autoconf -*-
-+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-@@ -143,7 +143,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
- [am__api_version='1.11'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.11], [],
-+m4_if([$1], [1.11.1], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -159,7 +159,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.11])dnl
-+[AM_AUTOMAKE_VERSION([1.11.1])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/package/file/Makefile b/package/file/Makefile
index 2b68ec306..e24b80cbb 100644
--- a/package/file/Makefile
+++ b/package/file/Makefile
@@ -19,7 +19,6 @@ $(eval $(call PKG_template,FILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_
pre-configure:
(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
- CFLAGS="-static" \
./configure --enable-static --disable-shared \
--disable-warnings \
);
diff --git a/package/nspr/Makefile b/package/nspr/Makefile
index 4a5fe323b..9072977a1 100644
--- a/package/nspr/Makefile
+++ b/package/nspr/Makefile
@@ -20,7 +20,7 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,NSPR,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_ENV+= HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}"
+CONFIGURE_ENV+= OS_TARGET="Linux" HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}"
post-install:
$(INSTALL_DIR) $(IDIR_NSPR)/usr/lib