From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Mon, 30 Dec 2019 18:02:16 +0000 (+0100)
Subject: apr-util: clean up the package
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=27c47239367f11ad8bc6b5ee19ec4fb78b99d5cf;p=feed%2Fpackages.git

apr-util: clean up the package

- removes extra flags '$(FPIC)' etc., there is no good reason for them
  being used
- stops removing aclocal.m4 and build/ltmain.sh (reason of removal of
  these files is not apparent anymore)
- adds PKG_BUILD_PARALLEL:=1

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
---

diff --git a/libs/apr-util/Makefile b/libs/apr-util/Makefile
index b067359f8c..6fe72ed982 100644
--- a/libs/apr-util/Makefile
+++ b/libs/apr-util/Makefile
@@ -18,8 +18,9 @@ PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
 PKG_LICENSE:=Apache License
 PKG_CPE_ID:=cpe:/a:apache:apr-util
 
+PKG_BUILD_PARALLEL:=1
+
 PKG_FIXUP:=autoreconf
-PKG_REMOVE_FILES:=aclocal.m4 build/ltmain.sh
 
 PKG_INSTALL:=1
 
@@ -34,9 +35,6 @@ define Package/libaprutil
   URL:=http://apr.apache.org/
 endef
 
-TARGET_CFLAGS += $(FPIC)
-TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
-
 CONFIGURE_ARGS += \
 	--with-pgsql=no \
 	--with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
@@ -55,9 +53,6 @@ CONFIGURE_VARS += \
 	ac_cv_path_ODBC_CONFIG= \
 	APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1"
 
-MAKE_FLAGS += \
-	APRUTIL_LIBS="-lsqlite3 $(TARGET_LDFLAGS) -lexpat $(if $(ICONV_FULL),-liconv) -lapr-1 -luuid -lm -lcrypt"
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1/ $(1)/usr/lib  $(1)/usr/lib/pkgconfig/
 	$(CP)   $(PKG_INSTALL_DIR)/usr/bin/apu-1-config \