diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2019-01-15 23:09:09 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2019-01-16 08:59:43 +0100 |
| commit | 84fb91477c1ea1a3be526d1c0de50b1ed475301e (patch) | |
| tree | 44337a29e42d6ce91b7208cde05fd74753a4a6e5 /source/d/ccache | |
| parent | befd8aa730c327d52ebc2dc93608bf33cc31b885 (diff) | |
| download | current-84fb91477c1ea1a3be526d1c0de50b1ed475301e.tar.gz current-84fb91477c1ea1a3be526d1c0de50b1ed475301e.tar.xz | |
Tue Jan 15 23:09:09 UTC 201920190115230909
d/ccache-3.6-x86_64-1.txz: Upgraded.
d/cmake-3.13.3-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/d/ccache')
| -rw-r--r-- | source/d/ccache/ccache.969a7d49d63f872b9c88661f432d4cfbfde074af.patch | 79 | ||||
| -rwxr-xr-x | source/d/ccache/ccache.SlackBuild | 2 |
2 files changed, 0 insertions, 81 deletions
diff --git a/source/d/ccache/ccache.969a7d49d63f872b9c88661f432d4cfbfde074af.patch b/source/d/ccache/ccache.969a7d49d63f872b9c88661f432d4cfbfde074af.patch deleted file mode 100644 index d332192b1..000000000 --- a/source/d/ccache/ccache.969a7d49d63f872b9c88661f432d4cfbfde074af.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 969a7d49d63f872b9c88661f432d4cfbfde074af Mon Sep 17 00:00:00 2001 -From: Joel Rosdahl <joel@rosdahl.net> -Date: Wed, 2 Jan 2019 16:24:56 +0100 -Subject: [PATCH] Fix getopt_long.c compilation warning in an easier way - -Fixes #340 in an alternative way (see also #341). ---- - Makefile.in | 2 +- - configure.ac | 5 ----- - dev.mk.in | 1 - - src/getopt_long.c | 6 +++++- - 4 files changed, 6 insertions(+), 8 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 9e90755d..c113e815 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -51,7 +51,7 @@ non_3pp_sources = \ - generated_sources = \ - src/version.c - 3pp_sources = \ -- @getopt_long_c@ \ -+ src/getopt_long.c \ - src/confitems_lookup.c \ - src/envtoconfitems_lookup.c \ - src/hashtable.c \ -diff --git a/configure.ac b/configure.ac -index d354ee18..a2234127 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -18,7 +18,6 @@ esac - - AC_SUBST(disable_man) - AC_SUBST(extra_libs) --AC_SUBST(getopt_long_c) - AC_SUBST(include_dev_mk) - AC_SUBST(more_warnings) - AC_SUBST(no_implicit_fallthrough_warning) -@@ -91,10 +90,6 @@ AC_CHECK_FUNCS(strtok_r) - AC_CHECK_FUNCS(unsetenv) - AC_CHECK_FUNCS(utimes) - --if test x"$ac_cv_func_getopt_long" != x"yes"; then -- getopt_long_c="src/getopt_long.c" --fi -- - AC_CACHE_CHECK([for compar_fn_t in stdlib.h],ccache_cv_COMPAR_FN_T, [ - AC_TRY_COMPILE( - [#include <stdlib.h>], -diff --git a/dev.mk.in b/dev.mk.in -index f5ce8b18..26c2a2c6 100644 ---- a/dev.mk.in -+++ b/dev.mk.in -@@ -92,7 +92,6 @@ source_dist_files = \ - src/confitems_lookup.c \ - src/envtoconfitems.gperf \ - src/envtoconfitems_lookup.c \ -- src/getopt_long.c \ - src/main.c \ - src/zlib/*.c \ - src/zlib/*.h \ -diff --git a/src/getopt_long.c b/src/getopt_long.c -index 61141c23..3e321930 100644 ---- a/src/getopt_long.c -+++ b/src/getopt_long.c -@@ -34,7 +34,11 @@ - - #include "config.h" - --#ifndef HAVE_GETOPT_LONG -+#ifdef HAVE_GETOPT_LONG -+ -+typedef int do_not_warn_about_empty_compilation_unit; -+ -+#else - - #include "getopt_long.h" - - diff --git a/source/d/ccache/ccache.SlackBuild b/source/d/ccache/ccache.SlackBuild index 25b0bc6c1..0b4b235fd 100755 --- a/source/d/ccache/ccache.SlackBuild +++ b/source/d/ccache/ccache.SlackBuild @@ -63,8 +63,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/ccache.969a7d49d63f872b9c88661f432d4cfbfde074af.patch.gz | patch -p1 --verbose || exit 1 - ./configure \ --prefix=/usr \ --mandir=/usr/man \ |