]> git.ipfire.org Git - people/arne_f/ipfire-3.x.git/commitdiff
rcs: Fix FTBFS
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 14 Oct 2016 19:11:59 +0000 (15:11 -0400)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 14 Oct 2016 19:11:59 +0000 (15:11 -0400)
Need to go back to C99 because of some inlining issues

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
rcs/patches/rcs-5.8-build-tweaks.patch [deleted file]
rcs/rcs.nm

diff --git a/rcs/patches/rcs-5.8-build-tweaks.patch b/rcs/patches/rcs-5.8-build-tweaks.patch
deleted file mode 100644 (file)
index d2f16bc..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up ./man/Makefile.in.build-tweaks ./man/Makefile.in
---- ./man/Makefile.in.build-tweaks     2013-05-06 09:28:45.000000000 +0200
-+++ ./man/Makefile.in  2013-05-10 23:03:36.975917262 +0200
-@@ -1237,9 +1237,9 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- dist_man_MANS = ci.1 co.1 ident.1 merge.1 rcs.1 rcsclean.1 \
--  rcsdiff.1 rcsfile.5 rcsmerge.1 rlog.1
-+  rcsdiff.1 rcsfile.5 rcsmerge.1 rlog.1 rcsfreeze.1
--dist_noinst_MANS = rcsfreeze.1
-+#dist_noinst_MANS = rcsfreeze.1
- BUILT_SOURCES = REL $(dist_noinst_MANS)
- bits = b-base \
-   b-emptylogmessage \
index f5eb07afd739aac426820e12ff2d2ee3e97010de..321cdc476eef7b7f3ea2adf05ce794c6bf0fa083 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = rcs
 version    = 5.9.4
-release    = 1
+release    = 2
 
 groups     = Development/Tools
 url        = http://www.gnu.org/software/rcs/
@@ -28,15 +28,13 @@ sources    = %{thisapp}.tar.xz
 
 build
        requires
-               autoconf
                ed
                ghostscript
                groff
        end
 
-       prepare_cmds
-               autoconf
-       end
+       # Has some inlining problems, so we need to go back to C99
+       CFLAGS += -std=c99
 
        configure_options += \
                --with-diffutils