diff --git a/make/target-tools.mk b/make/target-tools.mk index 8531b41e..0c54642f 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -525,15 +525,23 @@ $(D)/vsftpd: $(D)/openssl $(ARCHIVE)/vsftpd-$(VSFTPD_VER).tar.gz | $(TARGET_DIR) # ----------------------------------------------------------------------------- -PROCPS-NG_VER = 3.3.15 +PROCPS-NG_VER = 3.3.15 +PROCPS-NG = procps-ng-$(PROCPS-NG_VER) +PROCPS-NG_SOURCE = procps-ng-$(PROCPS-NG_VER).tar.xz +PROCPS-NG_URL = http://sourceforge.net/projects/procps-ng/files/Production -$(ARCHIVE)/procps-ng-$(PROCPS-NG_VER).tar.xz: - $(DOWNLOAD) http://sourceforge.net/projects/procps-ng/files/Production/procps-ng-$(PROCPS-NG_VER).tar.xz +$(ARCHIVE)/$(PROCPS-NG_SOURCE): + $(DOWNLOAD) $(PROCPS-NG_URL)/$(PROCPS-NG_SOURCE) -$(D)/procps-ng: $(D)/libncurses $(ARCHIVE)/procps-ng-$(PROCPS-NG_VER).tar.xz | $(TARGET_DIR) - $(REMOVE)/procps-ng-$(PROCPS-NG_VER) - $(UNTAR)/procps-ng-$(PROCPS-NG_VER).tar.xz - $(CHDIR)/procps-ng-$(PROCPS-NG_VER); \ +PROCPS-NG_PATCH = procps_0001-Fix-out-of-tree-builds.patch +PROCPS-NG_PATCH += procps-ng-no-tests-docs.patch + +PROCPS-NG_BIN = ps top + +$(D)/procps-ng: $(D)/libncurses $(ARCHIVE)/$(PROCPS-NG_SOURCE) | $(TARGET_DIR) + $(REMOVE)/$(PROCPS-NG) + $(UNTAR)/$(PROCPS-NG_SOURCE) + $(CHDIR)/$(PROCPS-NG); \ export ac_cv_func_malloc_0_nonnull=yes; \ export ac_cv_func_realloc_0_nonnull=yes; \ $(CONFIGURE) \ @@ -547,13 +555,13 @@ $(D)/procps-ng: $(D)/libncurses $(ARCHIVE)/procps-ng-$(PROCPS-NG_VER).tar.xz | $ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - for bin in ps top; do \ + for bin in $(PROCPS-NG_BIN); do \ rm -f $(TARGET_DIR)/bin/$$bin; \ install -m 0755 $(TARGET_DIR)/bin.procps/$$bin $(TARGET_DIR)/bin/$$bin; \ done $(REWRITE_PKGCONF)/libprocps.pc $(REWRITE_LIBTOOL)/libprocps.la - $(REMOVE)/procps-ng-$(PROCPS-NG_VER) \ + $(REMOVE)/$(PROCPS-NG) \ $(TARGET_DIR)/bin.procps \ $(TARGET_DIR)/sbin.procps $(TOUCH) diff --git a/patches/expat-libtool-tag.patch b/patches/expat-libtool-tag.patch new file mode 100644 index 00000000..a7f6454c --- /dev/null +++ b/patches/expat-libtool-tag.patch @@ -0,0 +1,30 @@ +From 10342e6b600858b091bc7771e454d9e06af06410 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 2 Nov 2017 18:20:57 +0800 +Subject: [PATCH] Add CC tag to build + +Add CC tag to build + +Upstream-Status: Pending +Signed-off-by: Khem Raj +Signed-off-by: Dengke Du +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 9560a95..d444bd6 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -330,7 +330,7 @@ LIBCURRENT = @LIBCURRENT@ + LIBOBJS = @LIBOBJS@ + LIBREVISION = @LIBREVISION@ + LIBS = @LIBS@ +-LIBTOOL = @LIBTOOL@ ++LIBTOOL = @LIBTOOL@ --tag CC + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +-- +2.7.4 + diff --git a/patches/ntp.patch b/patches/ntp.patch new file mode 100644 index 00000000..80dca36f --- /dev/null +++ b/patches/ntp.patch @@ -0,0 +1,11 @@ +--- a/scripts/build/mkver.in ++++ b/scripts/build/mkver.in +@@ -15,7 +15,7 @@ + *) ConfStr="${ConfStr}-@VER_SUFFIX@" ;; + esac + +-ConfStr="$ConfStr `LC_TIME=C TZ=UTC date`" ++ConfStr="$ConfStr" + + if [ ! -f .version ]; then + echo 0 > .version diff --git a/patches/procps-ng-no-tests-docs.patch b/patches/procps-ng-no-tests-docs.patch new file mode 100644 index 00000000..3ae60ace --- /dev/null +++ b/patches/procps-ng-no-tests-docs.patch @@ -0,0 +1,26 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -14,10 +14,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ + + ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = \ +- include \ +- man-po \ +- po \ +- testsuite ++ include + + AM_CFLAGS = -Iproc + LDADD = ./proc/libprocps.la $(CYGWINFLAGS) +--- a/configure.ac ++++ b/configure.ac +@@ -292,8 +292,5 @@ AC_CHECK_FUNCS([__fpending alarm atexit dup2 gethostname getpagesize gettimeofda + + AC_CONFIG_FILES([Makefile + include/Makefile +- man-po/Makefile +- po/Makefile.in +- proc/libprocps.pc +- testsuite/Makefile]) ++ proc/libprocps.pc]) + AC_OUTPUT diff --git a/patches/procps_0001-Fix-out-of-tree-builds.patch b/patches/procps_0001-Fix-out-of-tree-builds.patch new file mode 100644 index 00000000..e5481943 --- /dev/null +++ b/patches/procps_0001-Fix-out-of-tree-builds.patch @@ -0,0 +1,24 @@ +From 0825db94fc91fa2150c0e649e92cc8dcc44f4b38 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 4 Apr 2018 14:09:45 +0300 +Subject: [PATCH] Fix out of tree builds + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + include/nls.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/nls.h b/include/nls.h +index 1166b7b..f5abe05 100644 +--- a/include/nls.h ++++ b/include/nls.h +@@ -6,7 +6,7 @@ + #define PROCPS_NG_NLS_H + + /* programs issuing textdomain() need PACKAGE string */ +-#include "../config.h" ++#include "config.h" + + /* programs issuing bindtextdomain() also need LOCALEDIR string */ + #ifndef LOCALEDIR