mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@db180c0
This commit is contained in:
55
package/quota/0001-configure.ac-add-disable-pie-option.patch
Normal file
55
package/quota/0001-configure.ac-add-disable-pie-option.patch
Normal file
@@ -0,0 +1,55 @@
|
||||
From cb20e19028a8996de9305502ba5e5da3bd1181bf Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 2 Apr 2019 09:19:36 +0200
|
||||
Subject: [PATCH] configure.ac: add --disable-pie option
|
||||
|
||||
PIE is not necessarily supported on all architectures, so add an option
|
||||
to allow the user to disable the PIE.
|
||||
|
||||
This fixes the build on the m68k architecture:
|
||||
- http://autobuild.buildroot.org/results/25985bbc160e3d62b23c4c613b2a81f3711621e3
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: merged]
|
||||
---
|
||||
Makefile.am | 2 +-
|
||||
configure.ac | 12 ++++++++++++
|
||||
2 files changed, 13 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 638198d..332bd67 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -1,5 +1,5 @@
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
-AM_LDFLAGS = -pie
|
||||
+AM_LDFLAGS = @PIE_LDFLAGS@
|
||||
|
||||
doc_DATA = \
|
||||
README.mailserver \
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 095ff86..5af4235 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -55,6 +55,18 @@ AS_IF([test "x${prefix}" = "xNONE"], [
|
||||
AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/share/locale", [Locale-specific data directory])
|
||||
])
|
||||
|
||||
+# ================
|
||||
+# Check for ldflags
|
||||
+# ================
|
||||
+AC_ARG_ENABLE([pie],
|
||||
+ [AS_HELP_STRING([--disable-pie], [Disable Position Independent Executable])],
|
||||
+ [enable_pie="$enableval"],
|
||||
+ [enable_pie=yes]
|
||||
+)
|
||||
+AS_IF([test x"$enable_pie" != "xno"], [
|
||||
+ PIE_LDFLAGS="-pie"
|
||||
+])
|
||||
+AC_SUBST([PIE_LDFLAGS])
|
||||
|
||||
# ================
|
||||
# Check for cflags
|
||||
--
|
||||
2.14.1
|
||||
|
||||
15
package/quota/Config.in
Normal file
15
package/quota/Config.in
Normal file
@@ -0,0 +1,15 @@
|
||||
config BR2_PACKAGE_QUOTA
|
||||
bool "quota"
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS # libtirpc
|
||||
select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
|
||||
help
|
||||
Implementation of the disk quota system.
|
||||
|
||||
http://sourceforge.net/projects/linuxquota/
|
||||
|
||||
comment "quota needs a toolchain w/ wchar, threads"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_USE_WCHAR || \
|
||||
!(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC)
|
||||
7
package/quota/quota.hash
Normal file
7
package/quota/quota.hash
Normal file
@@ -0,0 +1,7 @@
|
||||
# From http://sourceforge.net/projects/linuxquota/files/quota-tools/4.05/ (click on info button)
|
||||
md5 1c1dbd2cd3d680ccac661239b067e147 quota-4.05.tar.gz
|
||||
sha1 d23711f3b204e0a86b8378c32545c95fb149168d quota-4.05.tar.gz
|
||||
|
||||
# Locally calculated
|
||||
sha256 ef3b5b5d1014ed1344b46c1826145e20cbef8db967b522403c9a060761cf7ab9 quota-4.05.tar.gz
|
||||
sha256 35b2d9797b83bce16076da9c3273f264f50b8d02f492ee32cd4c51ba6897bceb COPYING
|
||||
42
package/quota/quota.mk
Normal file
42
package/quota/quota.mk
Normal file
@@ -0,0 +1,42 @@
|
||||
################################################################################
|
||||
#
|
||||
# quota
|
||||
#
|
||||
################################################################################
|
||||
|
||||
QUOTA_VERSION = 4.05
|
||||
QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION)
|
||||
QUOTA_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-nfs-utils
|
||||
QUOTA_LICENSE = GPL-2.0+
|
||||
QUOTA_LICENSE_FILES = COPYING
|
||||
QUOTA_LIBS = $(TARGET_NLS_LIBS)
|
||||
QUOTA_CONF_OPTS = --disable-pie
|
||||
|
||||
ifeq ($(BR2_PACKAGE_DBUS)$(BR2_PACKAGE_LIBNL),yy)
|
||||
QUOTA_DEPENDENCIES += host-pkgconf dbus libnl
|
||||
QUOTA_CONF_OPTS += --enable-netlink
|
||||
else
|
||||
QUOTA_CONF_OPTS += --disable-netlink
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_E2FSPROGS),y)
|
||||
QUOTA_DEPENDENCIES += host-pkgconf e2fsprogs
|
||||
QUOTA_CONF_OPTS += --enable-ext2direct
|
||||
else
|
||||
QUOTA_CONF_OPTS += --disable-ext2direct
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
|
||||
QUOTA_DEPENDENCIES += libtirpc host-pkgconf
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENLDAP):$(BR2_STATIC_LIBS),y:)
|
||||
QUOTA_DEPENDENCIES += openldap
|
||||
QUOTA_CONF_OPTS += --enable-ldapmail
|
||||
else
|
||||
QUOTA_CONF_OPTS += --disable-ldapmail
|
||||
endif
|
||||
|
||||
QUOTA_CONF_ENV = LIBS="$(QUOTA_LIBS)"
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user