blob: beec73e3a0aec480d970ebe4d094aa332f244524 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
diff -ru CSSC-1.4.1.orig/src/Makefile.in CSSC-1.4.1/src/Makefile.in
--- CSSC-1.4.1.orig/src/Makefile.in 2019-05-07 13:44:57.000000000 +0200
+++ CSSC-1.4.1/src/Makefile.in 2024-03-10 17:07:33.463901630 +0100
@@ -1199,8 +1199,8 @@
generic_CPPFLAGS = -I ../gl/lib -I $(srcdir)/../gl/lib
AM_CPPFLAGS = $(generic_CPPFLAGS)
AM_CFLAGS = "-DPREFIX=\"$(csscutildir)/\"" $(generic_CPPFLAGS)
-AM_LDFLAGS = -L../gl/lib
-LDADD = -lgnulib
+AM_LDFLAGS =
+LDADD = ../gl/lib/libgnulib.la
AM_CXXFLAGS = $(WARN_CFLAGS)
noinst_LIBRARIES = libcssc.a
csscutil_SCRIPTS = sccsdiff
@@ -1271,7 +1271,7 @@
rmdel_LDADD = libcssc.a $(LIBOBJS)
prt_LDADD = libcssc.a $(LIBOBJS)
val_LDADD = libcssc.a $(LIBOBJS)
-sccs_LDADD = libcssc.a $(LIBOBJS) -lgnulib
+sccs_LDADD = libcssc.a $(LIBOBJS) ../gl/lib/libgnulib.la
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
diff -ru CSSC-1.4.1.orig/configure CSSC-1.4.1/configure
--- CSSC-1.4.1.orig/configure 2019-05-07 13:44:57.000000000 +0200
+++ CSSC-1.4.1/configure 2021-04-08 14:11:56.935465623 +0200
@@ -19418,60 +19418,6 @@
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if you are using a broken version of glibc with a version of GCC (>=2.97) that doesn't like it" >&5
-$as_echo_n "checking if you are using a broken version of glibc with a version of GCC (>=2.97) that doesn't like it... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <stdio.h>
-int x = 0;
-class foo {
-public:
-foo() { }
-void some_member_function(void) { };
-int printf(const char *fmt, ...);
-};
-
-int
-main ()
-{
-/* no function body*/
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-oldCFLAGS="$CFLAGS"
-oldCXXFLAGS="$CXXFLAGS"
-if echo "$CFLAGS" | grep -e "-O" >/dev/null
-then
- CFLAGS="-g"
- CXXFLAGS="-g"
-
-echo
-echo WARNING It seems that you are using a version of GNU lilbc
-echo WARNING that has a broken printf macro in /usr/include/bits/stdio.h.
-echo WARNING I have changed CFLAGS and CXXFLAGS to turn optimisation off
-echo WARNING in order to work around the problem.
-echo WARNING
-echo WARNING Other possible workarounds would be to use GCC 2.96 or
-echo WARNING earlier, or a version of glibc which does not have this
-echo WARNING bug.
-echo WARNING
-echo WARNING CFLAGS has been changed from "$oldCFLAGS" to "$CFLAGS"
-echo WARNING CXXFLAGS has been changed from "$oldCXXFLAGS" to "$CXXFLAGS"
-echo
-
-fi
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
|
