Browse Source

findutils: modernized package and removed obsolete patches

master
Nagy Károly Gábriel 8 years ago
parent
commit
973ad8b829
3 changed files with 57 additions and 88 deletions
  1. +3
    -3
      base/findutils/findutils.conf
  2. +54
    -0
      base/findutils/fix-gnulib-freadahead.patch
  3. +0
    -85
      base/findutils/no_charset.alias.patch

+ 3
- 3
base/findutils/findutils.conf

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../findutils/findutils.conf
# Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2008 - 2015 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
@ -30,6 +30,6 @@ if ! atstage toolchain; then
hook_add postmake 3 "fu_pm"
fi
export CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64"
export CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=0"
var_append INSTALL_WRAPPER_FILTER "|" "sed -e 's,.*/charset.alias,/tmp/x,'"

+ 54
- 0
base/findutils/fix-gnulib-freadahead.patch

@ -0,0 +1,54 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../findutils/fix-gnulib-freadahead.patch
# Copyright (C) 2015 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- findutils-4.4.2.orig/gnulib/lib/freadahead.c
+++ findutils-4.4.2/gnulib/lib/freadahead.c
@@ -19,6 +19,7 @@
/* Specification. */
#include "freadahead.h"
+#ifndef HAVE___FREADAHEAD
size_t
freadahead (FILE *fp)
{
@@ -64,3 +65,4 @@
#error "Please port gnulib freadahead.c to your platform! Look at the definition of fflush, fread on your system, then report this to bug-gnulib."
#endif
}
+#endif
--- findutils-4.4.2.orig/gnulib/lib/freadahead.h
+++ findutils-4.4.2/gnulib/lib/freadahead.h
@@ -29,7 +29,20 @@
STREAM must not be wide-character oriented. */
+#if HAVE___FREADAHEAD || (defined(__linux__) && !defined(__GLIBC__) && !defined(__UCLIBC__)) /* musl libc */
+
+#ifndef HAVE___FREADAHEAD
+#define HAVE___FREADAHEAD 1
+#endif
+
+# include <stdio_ext.h>
+# define freadahead(stream) __freadahead (stream)
+
+#else
+
extern size_t freadahead (FILE *stream);
+
+#endif
#ifdef __cplusplus
}

+ 0
- 85
base/findutils/no_charset.alias.patch

@ -1,85 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../findutils/no_charset.alias.patch
# Copyright (C) 2015 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./gnulib/lib/Makefile.in.orig 2009-05-16 17:28:13.000000000 +0200
+++ ./gnulib/lib/Makefile.in 2015-10-28 14:18:11.787788072 +0100
@@ -981,7 +981,7 @@
check-am: all-am
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) all-local
+all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS)
installdirs:
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-am
@@ -1041,7 +1041,7 @@
install-dvi: install-dvi-am
-install-exec-am: install-exec-local
+install-exec-am:
install-html: install-html-am
@@ -1073,7 +1073,7 @@
ps-am:
-uninstall-am: uninstall-local
+uninstall-am:
.MAKE: install-am install-strip
@@ -1227,37 +1227,9 @@
# On systems with glibc-2.1 or newer, the file is redundant, therefore we
# avoid installing it.
-all-local: charset.alias ref-add.sed ref-del.sed
-install-exec-local: all-local
- test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
- if test -f $(charset_alias); then \
- sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
- rm -f $(charset_tmp) ; \
- else \
- if test $(GLIBC21) = no; then \
- sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
- rm -f $(charset_tmp) ; \
- fi ; \
- fi
-
-uninstall-local: all-local
- if test -f $(charset_alias); then \
- sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
- if grep '^# Packages using this file: $$' $(charset_tmp) \
- > /dev/null; then \
- rm -f $(charset_alias); \
- else \
- $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
- fi; \
- rm -f $(charset_tmp); \
- fi
+all-local:
+install-exec-local:
-charset.alias: config.charset
- rm -f t-$@ $@
- $(SHELL) $(srcdir)/config.charset '$(host)' > t-$@
- mv t-$@ $@
.sin.sed:
rm -f t-$@ $@
sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@

Loading…
Cancel
Save