Commits

Marius Schamschula authored 1e84bec0c97 
cfengine3: update to 3.12.1 (LTS)

update master_sites, modernize checksums
No tags
cdba7879ca0
master

sysutils/cfengine3/files/patch-configure.diff

Modified
1 ---- configure.orig 2013-02-12 09:40:18.000000000 -0800
2 -+++ configure 2013-02-12 10:41:47.000000000 -0800
3 -@@ -10497,7 +10497,7 @@
1 +--- configure.orig 2018-11-29 05:45:16.000000000 -0600
2 ++++ configure 2019-02-15 15:56:08.000000000 -0600
3 +@@ -9928,7 +9928,7 @@
4 4 archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
5 5 else
6 6 if test "$host_cpu" = ia64; then
7 7 - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
8 8 + hardcode_libdir_flag_spec='${wl}-rpath $libdir:/usr/lib:/lib'
9 9 allow_undefined_flag="-z nodefs"
10 10 archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
11 11 else
12 -@@ -10695,7 +10695,7 @@
12 +@@ -10124,7 +10124,7 @@
13 13 # extra space).
14 14 freebsd2.2*)
15 15 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
16 16 - hardcode_libdir_flag_spec='-R$libdir'
17 17 + hardcode_libdir_flag_spec='-rpath $libdir'
18 18 hardcode_direct=yes
19 19 hardcode_shlibpath_var=no
20 20 ;;
21 -@@ -10711,7 +10711,7 @@
21 +@@ -10140,7 +10140,7 @@
22 22 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
23 23 freebsd* | dragonfly*)
24 24 archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
25 25 - hardcode_libdir_flag_spec='-R$libdir'
26 26 + hardcode_libdir_flag_spec='-rpath $libdir'
27 27 hardcode_direct=yes
28 28 hardcode_shlibpath_var=no
29 29 ;;
30 -@@ -10887,7 +10887,7 @@
30 +@@ -10315,7 +10315,7 @@
31 31 else
32 32 archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
33 33 fi
34 34 - hardcode_libdir_flag_spec='-R$libdir'
35 35 + hardcode_libdir_flag_spec='-rpath $libdir'
36 36 hardcode_direct=yes
37 37 hardcode_shlibpath_var=no
38 38 ;;
39 -@@ -10917,7 +10917,7 @@
39 +@@ -10345,7 +10345,7 @@
40 40 case $host_os in
41 41 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
42 42 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
43 43 - hardcode_libdir_flag_spec='-R$libdir'
44 44 + hardcode_libdir_flag_spec='-rpath $libdir'
45 45 ;;
46 46 *)
47 47 archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
48 -@@ -10992,7 +10992,7 @@
48 +@@ -10420,7 +10420,7 @@
49 49 ;;
50 50 esac
51 51 fi
52 52 - hardcode_libdir_flag_spec='-R$libdir'
53 53 + hardcode_libdir_flag_spec='-rpath $libdir'
54 54 hardcode_shlibpath_var=no
55 55 case $host_os in
56 56 solaris2.[0-5] | solaris2.[0-5].*) ;;
57 -@@ -11089,7 +11089,7 @@
57 +@@ -10517,7 +10517,7 @@
58 58 allow_undefined_flag='${wl}-z,nodefs'
59 59 archive_cmds_need_lc=no
60 60 hardcode_shlibpath_var=no
61 61 - hardcode_libdir_flag_spec='${wl}-R,$libdir'
62 62 + hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
63 63 hardcode_libdir_separator=':'
64 64 link_all_deplibs=yes
65 65 export_dynamic_flag_spec='${wl}-Bexport'
66 -@@ -13868,7 +13868,7 @@
67 - #
68 - if test "x$with_postgresql" != xyes && test "x$with_postgresql" != xcheck; then
69 - if test "x$with_postgresql" != x/usr && test "x$with_postgresql" != x/; then
70 -- POSTGRESQL_LDFLAGS="$POSTGRESQL_LDFLAGS -Wl,-R$with_postgresql/lib"
71 -+ POSTGRESQL_LDFLAGS="$POSTGRESQL_LDFLAGS -Wl,-rpath,$with_postgresql/lib"
72 - fi
73 - fi
74 -
75 -@@ -14055,7 +14055,7 @@
76 - #
77 - if test "x$with_mysql" != xyes && test "x$with_mysql" != xcheck; then
78 - if test "x$with_mysql" != x/usr && test "x$with_mysql" != x/; then
79 -- MYSQL_LDFLAGS="$MYSQL_LDFLAGS -Wl,-R$with_mysql/lib"
80 -+ MYSQL_LDFLAGS="$MYSQL_LDFLAGS -Wl,-rpath,$with_mysql/lib"
81 - fi
82 - fi
83 -
84 -@@ -14214,7 +14214,7 @@
85 - #
86 - if test "x$with_qdbm" != xyes && test "x$with_qdbm" != xcheck; then
87 - if test "x$with_qdbm" != x/usr && test "x$with_qdbm" != x/; then
88 -- QDBM_LDFLAGS="$QDBM_LDFLAGS -Wl,-R$with_qdbm/lib"
89 -+ QDBM_LDFLAGS="$QDBM_LDFLAGS -Wl,-rpath,$with_qdbm/lib"
90 - fi
91 - fi
92 -
93 -@@ -14367,7 +14367,7 @@
94 - #
95 - if test "x$with_tokyocabinet" != xyes && test "x$with_tokyocabinet" != xcheck; then
96 - if test "x$with_tokyocabinet" != x/usr && test "x$with_tokyocabinet" != x/; then
97 -- TOKYOCABINET_LDFLAGS="$TOKYOCABINET_LDFLAGS -Wl,-R$with_tokyocabinet/lib"
98 -+ TOKYOCABINET_LDFLAGS="$TOKYOCABINET_LDFLAGS -Wl,-rpath,$with_tokyocabinet/lib"
99 - fi
100 - fi
101 -
102 -@@ -14527,7 +14527,7 @@
103 - #
104 - if test "x$with_openssl" != xyes && test "x$with_openssl" != xcheck; then
105 - if test "x$with_openssl" != x/usr && test "x$with_openssl" != x/; then
106 -- OPENSSL_LDFLAGS="$OPENSSL_LDFLAGS -Wl,-R$with_openssl/lib"
107 -+ OPENSSL_LDFLAGS="$OPENSSL_LDFLAGS -Wl,-rpath,$with_openssl/lib"
108 - fi
109 - fi
110 -
111 -@@ -14674,7 +14674,7 @@
112 - #
113 - if test "x$with_pcre" != xyes && test "x$with_pcre" != xcheck; then
114 - if test "x$with_pcre" != x/usr && test "x$with_pcre" != x/; then
115 -- PCRE_LDFLAGS="$PCRE_LDFLAGS -Wl,-R$with_pcre/lib"
116 -+ PCRE_LDFLAGS="$PCRE_LDFLAGS -Wl,-rpath,$with_pcre/lib"
117 - fi
118 - fi
119 -
120 -@@ -14805,7 +14805,7 @@
121 - #
122 - if test "x$with_libvirt" != xyes && test "x$with_libvirt" != xcheck; then
123 - if test "x$with_libvirt" != x/usr && test "x$with_libvirt" != x/; then
124 -- LIBVIRT_LDFLAGS="$LIBVIRT_LDFLAGS -Wl,-R$with_libvirt/lib"
125 -+ LIBVIRT_LDFLAGS="$LIBVIRT_LDFLAGS -Wl,-rpath,$with_libvirt/lib"
126 - fi
127 - fi
128 -
129 -@@ -14938,7 +14938,7 @@
130 - #
131 - if test "x$with_libacl" != xyes && test "x$with_libacl" != xcheck; then
132 - if test "x$with_libacl" != x/usr && test "x$with_libacl" != x/; then
133 -- LIBACL_LDFLAGS="$LIBACL_LDFLAGS -Wl,-R$with_libacl/lib"
134 -+ LIBACL_LDFLAGS="$LIBACL_LDFLAGS -Wl,-rpath,$with_libacl/lib"
135 - fi
136 - fi
137 -
138 -@@ -15084,7 +15084,7 @@
139 - #
140 - if test "x$with_libxml2" != xyes && test "x$with_libxml2" != xcheck; then
141 - if test "x$with_libxml2" != x/usr && test "x$with_libxml2" != x/; then
142 -- LIBXML2_LDFLAGS="$LIBXML2_LDFLAGS -Wl,-R$with_libxml2/lib"
143 -+ LIBXML2_LDFLAGS="$LIBXML2_LDFLAGS -Wl,-rpath,$with_libxml2/lib"
144 - fi
145 - fi
146 -

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut