diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:14:24 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:29:45 +0100 |
| commit | 29d6678fd546377459ef75cf54abeef5b969b5cf (patch) | |
| tree | 8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-devtools/elfutils/elfutils-0.148/do-autoreconf.diff | |
| parent | da49de6885ee1bc424e70bc02f21f6ab920efb55 (diff) | |
| download | poky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz | |
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.
The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.
Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/elfutils/elfutils-0.148/do-autoreconf.diff')
| -rw-r--r-- | meta/recipes-devtools/elfutils/elfutils-0.148/do-autoreconf.diff | 337 |
1 files changed, 337 insertions, 0 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/do-autoreconf.diff b/meta/recipes-devtools/elfutils/elfutils-0.148/do-autoreconf.diff new file mode 100644 index 0000000000..41afa5ef36 --- /dev/null +++ b/meta/recipes-devtools/elfutils/elfutils-0.148/do-autoreconf.diff | |||
| @@ -0,0 +1,337 @@ | |||
| 1 | Generated by copying the whole dir, running `sh debian/autogen.sh` and diffing. | ||
| 2 | |||
| 3 | Index: elfutils-0.148/backends/Makefile.in | ||
| 4 | =================================================================== | ||
| 5 | --- elfutils-0.148.orig/backends/Makefile.in 2010-07-03 13:07:10.000000000 +0000 | ||
| 6 | +++ elfutils-0.148/backends/Makefile.in 2010-07-03 13:13:52.000000000 +0000 | ||
| 7 | @@ -77,39 +77,54 @@ | ||
| 8 | am__objects_4 = ia64_init.$(OBJEXT) ia64_symbol.$(OBJEXT) \ | ||
| 9 | ia64_regs.$(OBJEXT) ia64_retval.$(OBJEXT) | ||
| 10 | libebl_ia64_pic_a_OBJECTS = $(am_libebl_ia64_pic_a_OBJECTS) | ||
| 11 | +libebl_m68k_pic_a_AR = $(AR) $(ARFLAGS) | ||
| 12 | +libebl_m68k_pic_a_LIBADD = | ||
| 13 | +am__objects_5 = m68k_init.$(OBJEXT) m68k_symbol.$(OBJEXT) \ | ||
| 14 | + m68k_regs.$(OBJEXT) | ||
| 15 | +libebl_m68k_pic_a_OBJECTS = $(am_libebl_m68k_pic_a_OBJECTS) | ||
| 16 | +libebl_mips_pic_a_AR = $(AR) $(ARFLAGS) | ||
| 17 | +libebl_mips_pic_a_LIBADD = | ||
| 18 | +am__objects_6 = mips_init.$(OBJEXT) mips_symbol.$(OBJEXT) \ | ||
| 19 | + mips_regs.$(OBJEXT) mips_retval.$(OBJEXT) | ||
| 20 | +libebl_mips_pic_a_OBJECTS = $(am_libebl_mips_pic_a_OBJECTS) | ||
| 21 | +libebl_parisc_pic_a_AR = $(AR) $(ARFLAGS) | ||
| 22 | +libebl_parisc_pic_a_LIBADD = | ||
| 23 | +am__objects_7 = parisc_init.$(OBJEXT) parisc_symbol.$(OBJEXT) \ | ||
| 24 | + parisc_regs.$(OBJEXT) parisc_retval.$(OBJEXT) | ||
| 25 | +libebl_parisc_pic_a_OBJECTS = $(am_libebl_parisc_pic_a_OBJECTS) | ||
| 26 | libebl_ppc64_pic_a_AR = $(AR) $(ARFLAGS) | ||
| 27 | libebl_ppc64_pic_a_LIBADD = | ||
| 28 | -am__objects_5 = ppc64_init.$(OBJEXT) ppc64_symbol.$(OBJEXT) \ | ||
| 29 | +am__objects_8 = ppc64_init.$(OBJEXT) ppc64_symbol.$(OBJEXT) \ | ||
| 30 | ppc64_retval.$(OBJEXT) ppc64_corenote.$(OBJEXT) \ | ||
| 31 | ppc_regs.$(OBJEXT) ppc_auxv.$(OBJEXT) ppc_attrs.$(OBJEXT) \ | ||
| 32 | ppc_syscall.$(OBJEXT) | ||
| 33 | libebl_ppc64_pic_a_OBJECTS = $(am_libebl_ppc64_pic_a_OBJECTS) | ||
| 34 | libebl_ppc_pic_a_AR = $(AR) $(ARFLAGS) | ||
| 35 | libebl_ppc_pic_a_LIBADD = | ||
| 36 | -am__objects_6 = ppc_init.$(OBJEXT) ppc_symbol.$(OBJEXT) \ | ||
| 37 | +am__objects_9 = ppc_init.$(OBJEXT) ppc_symbol.$(OBJEXT) \ | ||
| 38 | ppc_retval.$(OBJEXT) ppc_regs.$(OBJEXT) ppc_corenote.$(OBJEXT) \ | ||
| 39 | ppc_auxv.$(OBJEXT) ppc_attrs.$(OBJEXT) ppc_syscall.$(OBJEXT) | ||
| 40 | libebl_ppc_pic_a_OBJECTS = $(am_libebl_ppc_pic_a_OBJECTS) | ||
| 41 | libebl_s390_pic_a_AR = $(AR) $(ARFLAGS) | ||
| 42 | libebl_s390_pic_a_LIBADD = | ||
| 43 | -am__objects_7 = s390_init.$(OBJEXT) s390_symbol.$(OBJEXT) \ | ||
| 44 | +am__objects_10 = s390_init.$(OBJEXT) s390_symbol.$(OBJEXT) \ | ||
| 45 | s390_regs.$(OBJEXT) s390_retval.$(OBJEXT) | ||
| 46 | libebl_s390_pic_a_OBJECTS = $(am_libebl_s390_pic_a_OBJECTS) | ||
| 47 | libebl_sh_pic_a_AR = $(AR) $(ARFLAGS) | ||
| 48 | libebl_sh_pic_a_LIBADD = | ||
| 49 | -am__objects_8 = sh_init.$(OBJEXT) sh_symbol.$(OBJEXT) \ | ||
| 50 | +am__objects_11 = sh_init.$(OBJEXT) sh_symbol.$(OBJEXT) \ | ||
| 51 | sh_corenote.$(OBJEXT) sh_regs.$(OBJEXT) sh_retval.$(OBJEXT) | ||
| 52 | libebl_sh_pic_a_OBJECTS = $(am_libebl_sh_pic_a_OBJECTS) | ||
| 53 | libebl_sparc_pic_a_AR = $(AR) $(ARFLAGS) | ||
| 54 | libebl_sparc_pic_a_LIBADD = | ||
| 55 | -am__objects_9 = sparc_init.$(OBJEXT) sparc_symbol.$(OBJEXT) \ | ||
| 56 | +am__objects_12 = sparc_init.$(OBJEXT) sparc_symbol.$(OBJEXT) \ | ||
| 57 | sparc_regs.$(OBJEXT) sparc_retval.$(OBJEXT) \ | ||
| 58 | sparc_corenote.$(OBJEXT) sparc64_corenote.$(OBJEXT) \ | ||
| 59 | sparc_auxv.$(OBJEXT) | ||
| 60 | libebl_sparc_pic_a_OBJECTS = $(am_libebl_sparc_pic_a_OBJECTS) | ||
| 61 | libebl_x86_64_pic_a_AR = $(AR) $(ARFLAGS) | ||
| 62 | libebl_x86_64_pic_a_LIBADD = | ||
| 63 | -am__objects_10 = x86_64_init.$(OBJEXT) x86_64_symbol.$(OBJEXT) \ | ||
| 64 | +am__objects_13 = x86_64_init.$(OBJEXT) x86_64_symbol.$(OBJEXT) \ | ||
| 65 | x86_64_corenote.$(OBJEXT) x86_64_cfi.$(OBJEXT) \ | ||
| 66 | x86_64_retval.$(OBJEXT) x86_64_regs.$(OBJEXT) \ | ||
| 67 | i386_auxv.$(OBJEXT) x86_64_syscall.$(OBJEXT) | ||
| 68 | @@ -124,15 +139,18 @@ | ||
| 69 | LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
| 70 | SOURCES = $(libebl_alpha_pic_a_SOURCES) $(libebl_arm_pic_a_SOURCES) \ | ||
| 71 | $(libebl_i386_pic_a_SOURCES) $(libebl_ia64_pic_a_SOURCES) \ | ||
| 72 | - $(libebl_ppc64_pic_a_SOURCES) $(libebl_ppc_pic_a_SOURCES) \ | ||
| 73 | - $(libebl_s390_pic_a_SOURCES) $(libebl_sh_pic_a_SOURCES) \ | ||
| 74 | - $(libebl_sparc_pic_a_SOURCES) $(libebl_x86_64_pic_a_SOURCES) | ||
| 75 | -DIST_SOURCES = $(libebl_alpha_pic_a_SOURCES) \ | ||
| 76 | - $(libebl_arm_pic_a_SOURCES) $(libebl_i386_pic_a_SOURCES) \ | ||
| 77 | - $(libebl_ia64_pic_a_SOURCES) $(libebl_ppc64_pic_a_SOURCES) \ | ||
| 78 | + $(libebl_m68k_pic_a_SOURCES) $(libebl_mips_pic_a_SOURCES) \ | ||
| 79 | + $(libebl_parisc_pic_a_SOURCES) $(libebl_ppc64_pic_a_SOURCES) \ | ||
| 80 | $(libebl_ppc_pic_a_SOURCES) $(libebl_s390_pic_a_SOURCES) \ | ||
| 81 | $(libebl_sh_pic_a_SOURCES) $(libebl_sparc_pic_a_SOURCES) \ | ||
| 82 | $(libebl_x86_64_pic_a_SOURCES) | ||
| 83 | +DIST_SOURCES = $(libebl_alpha_pic_a_SOURCES) \ | ||
| 84 | + $(libebl_arm_pic_a_SOURCES) $(libebl_i386_pic_a_SOURCES) \ | ||
| 85 | + $(libebl_ia64_pic_a_SOURCES) $(libebl_m68k_pic_a_SOURCES) \ | ||
| 86 | + $(libebl_mips_pic_a_SOURCES) $(libebl_parisc_pic_a_SOURCES) \ | ||
| 87 | + $(libebl_ppc64_pic_a_SOURCES) $(libebl_ppc_pic_a_SOURCES) \ | ||
| 88 | + $(libebl_s390_pic_a_SOURCES) $(libebl_sh_pic_a_SOURCES) \ | ||
| 89 | + $(libebl_sparc_pic_a_SOURCES) $(libebl_x86_64_pic_a_SOURCES) | ||
| 90 | DATA = $(noinst_DATA) | ||
| 91 | HEADERS = $(noinst_HEADERS) | ||
| 92 | ETAGS = etags | ||
| 93 | @@ -270,11 +288,12 @@ | ||
| 94 | CLEANFILES = *.gcno *.gcda $(foreach m,$(modules), libebl_$(m).map \ | ||
| 95 | libebl_$(m).so $(am_libebl_$(m)_pic_a_OBJECTS)) | ||
| 96 | textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi | ||
| 97 | -modules = i386 sh x86_64 ia64 alpha arm sparc ppc ppc64 s390 | ||
| 98 | +modules = i386 sh x86_64 ia64 alpha arm sparc ppc ppc64 s390 parisc mips m68k | ||
| 99 | libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \ | ||
| 100 | libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \ | ||
| 101 | libebl_sparc_pic.a libebl_ppc_pic.a libebl_ppc64_pic.a \ | ||
| 102 | - libebl_s390_pic.a | ||
| 103 | + libebl_s390_pic.a libebl_parisc_pic.a libebl_mips_pic.a \ | ||
| 104 | + libebl_m68k_pic.a | ||
| 105 | |||
| 106 | noinst_LIBRARIES = $(libebl_pic) | ||
| 107 | noinst_DATA = $(libebl_pic:_pic.a=.so) | ||
| 108 | @@ -328,6 +347,15 @@ | ||
| 109 | s390_SRCS = s390_init.c s390_symbol.c s390_regs.c s390_retval.c | ||
| 110 | libebl_s390_pic_a_SOURCES = $(s390_SRCS) | ||
| 111 | am_libebl_s390_pic_a_OBJECTS = $(s390_SRCS:.c=.os) | ||
| 112 | +parisc_SRCS = parisc_init.c parisc_symbol.c parisc_regs.c parisc_retval.c | ||
| 113 | +libebl_parisc_pic_a_SOURCES = $(parisc_SRCS) | ||
| 114 | +am_libebl_parisc_pic_a_OBJECTS = $(parisc_SRCS:.c=.os) | ||
| 115 | +mips_SRCS = mips_init.c mips_symbol.c mips_regs.c mips_retval.c | ||
| 116 | +libebl_mips_pic_a_SOURCES = $(mips_SRCS) | ||
| 117 | +am_libebl_mips_pic_a_OBJECTS = $(mips_SRCS:.c=.os) | ||
| 118 | +m68k_SRCS = m68k_init.c m68k_symbol.c m68k_regs.c | ||
| 119 | +libebl_m68k_pic_a_SOURCES = $(m68k_SRCS) | ||
| 120 | +am_libebl_m68k_pic_a_OBJECTS = $(m68k_SRCS:.c=.os) | ||
| 121 | noinst_HEADERS = libebl_CPU.h common-reloc.c linux-core-note.c x86_corenote.c | ||
| 122 | EXTRA_DIST = $(foreach m,$(modules),$($(m)_SRCS)) $(modules:=_reloc.def) | ||
| 123 | all: all-am | ||
| 124 | @@ -383,6 +411,18 @@ | ||
| 125 | -rm -f libebl_ia64_pic.a | ||
| 126 | $(libebl_ia64_pic_a_AR) libebl_ia64_pic.a $(libebl_ia64_pic_a_OBJECTS) $(libebl_ia64_pic_a_LIBADD) | ||
| 127 | $(RANLIB) libebl_ia64_pic.a | ||
| 128 | +libebl_m68k_pic.a: $(libebl_m68k_pic_a_OBJECTS) $(libebl_m68k_pic_a_DEPENDENCIES) | ||
| 129 | + -rm -f libebl_m68k_pic.a | ||
| 130 | + $(libebl_m68k_pic_a_AR) libebl_m68k_pic.a $(libebl_m68k_pic_a_OBJECTS) $(libebl_m68k_pic_a_LIBADD) | ||
| 131 | + $(RANLIB) libebl_m68k_pic.a | ||
| 132 | +libebl_mips_pic.a: $(libebl_mips_pic_a_OBJECTS) $(libebl_mips_pic_a_DEPENDENCIES) | ||
| 133 | + -rm -f libebl_mips_pic.a | ||
| 134 | + $(libebl_mips_pic_a_AR) libebl_mips_pic.a $(libebl_mips_pic_a_OBJECTS) $(libebl_mips_pic_a_LIBADD) | ||
| 135 | + $(RANLIB) libebl_mips_pic.a | ||
| 136 | +libebl_parisc_pic.a: $(libebl_parisc_pic_a_OBJECTS) $(libebl_parisc_pic_a_DEPENDENCIES) | ||
| 137 | + -rm -f libebl_parisc_pic.a | ||
| 138 | + $(libebl_parisc_pic_a_AR) libebl_parisc_pic.a $(libebl_parisc_pic_a_OBJECTS) $(libebl_parisc_pic_a_LIBADD) | ||
| 139 | + $(RANLIB) libebl_parisc_pic.a | ||
| 140 | libebl_ppc64_pic.a: $(libebl_ppc64_pic_a_OBJECTS) $(libebl_ppc64_pic_a_DEPENDENCIES) | ||
| 141 | -rm -f libebl_ppc64_pic.a | ||
| 142 | $(libebl_ppc64_pic_a_AR) libebl_ppc64_pic.a $(libebl_ppc64_pic_a_OBJECTS) $(libebl_ppc64_pic_a_LIBADD) | ||
| 143 | @@ -439,6 +479,17 @@ | ||
| 144 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ia64_regs.Po@am__quote@ | ||
| 145 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ia64_retval.Po@am__quote@ | ||
| 146 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ia64_symbol.Po@am__quote@ | ||
| 147 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68k_init.Po@am__quote@ | ||
| 148 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68k_regs.Po@am__quote@ | ||
| 149 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68k_symbol.Po@am__quote@ | ||
| 150 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mips_init.Po@am__quote@ | ||
| 151 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mips_regs.Po@am__quote@ | ||
| 152 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mips_retval.Po@am__quote@ | ||
| 153 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mips_symbol.Po@am__quote@ | ||
| 154 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parisc_init.Po@am__quote@ | ||
| 155 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parisc_regs.Po@am__quote@ | ||
| 156 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parisc_retval.Po@am__quote@ | ||
| 157 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parisc_symbol.Po@am__quote@ | ||
| 158 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppc64_corenote.Po@am__quote@ | ||
| 159 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppc64_init.Po@am__quote@ | ||
| 160 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppc64_retval.Po@am__quote@ | ||
| 161 | Index: elfutils-0.148/configure | ||
| 162 | =================================================================== | ||
| 163 | --- elfutils-0.148.orig/configure 2010-07-03 13:06:16.000000000 +0000 | ||
| 164 | +++ elfutils-0.148/configure 2010-07-03 13:13:49.000000000 +0000 | ||
| 165 | @@ -602,6 +602,8 @@ | ||
| 166 | base_cpu | ||
| 167 | NATIVE_LD_FALSE | ||
| 168 | NATIVE_LD_TRUE | ||
| 169 | +LD_AS_NEEDED | ||
| 170 | +WEXTRA | ||
| 171 | LEXLIB | ||
| 172 | LEX_OUTPUT_ROOT | ||
| 173 | LEX | ||
| 174 | @@ -3852,6 +3854,130 @@ | ||
| 175 | as_fn_error "gcc with C99 support required" "$LINENO" 5 | ||
| 176 | fi | ||
| 177 | |||
| 178 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra option to $CC" >&5 | ||
| 179 | +$as_echo_n "checking for -Wextra option to $CC... " >&6; } | ||
| 180 | +if test "${ac_cv_cc_wextra+set}" = set; then : | ||
| 181 | + $as_echo_n "(cached) " >&6 | ||
| 182 | +else | ||
| 183 | + old_CFLAGS="$CFLAGS" | ||
| 184 | +CFLAGS="$CFLAGS -Wextra" | ||
| 185 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| 186 | +/* end confdefs.h. */ | ||
| 187 | +void foo (void) { } | ||
| 188 | +_ACEOF | ||
| 189 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
| 190 | + ac_cv_cc_wextra=yes | ||
| 191 | +else | ||
| 192 | + ac_cv_cc_wextra=no | ||
| 193 | +fi | ||
| 194 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
| 195 | +CFLAGS="$old_CFLAGS" | ||
| 196 | +fi | ||
| 197 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_wextra" >&5 | ||
| 198 | +$as_echo "$ac_cv_cc_wextra" >&6; } | ||
| 199 | + | ||
| 200 | +if test "x$ac_cv_cc_wextra" = xyes; then : | ||
| 201 | + WEXTRA=-Wextra | ||
| 202 | +else | ||
| 203 | + WEXTRA=-W | ||
| 204 | +fi | ||
| 205 | + | ||
| 206 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fgnu89-inline option to $CC" >&5 | ||
| 207 | +$as_echo_n "checking for -fgnu89-inline option to $CC... " >&6; } | ||
| 208 | +if test "${ac_cv_cc_gnu89_inline+set}" = set; then : | ||
| 209 | + $as_echo_n "(cached) " >&6 | ||
| 210 | +else | ||
| 211 | + old_CFLAGS="$CFLAGS" | ||
| 212 | +CFLAGS="$CFLAGS -fgnu89-inline -Werror" | ||
| 213 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| 214 | +/* end confdefs.h. */ | ||
| 215 | + | ||
| 216 | +void foo (void) | ||
| 217 | +{ | ||
| 218 | + inline void bar (void) {} | ||
| 219 | + bar (); | ||
| 220 | +} | ||
| 221 | +extern inline void baz (void) {} | ||
| 222 | + | ||
| 223 | +_ACEOF | ||
| 224 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
| 225 | + ac_cv_cc_gnu89_inline=yes | ||
| 226 | +else | ||
| 227 | + ac_cv_cc_gnu89_inline=no | ||
| 228 | +fi | ||
| 229 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
| 230 | +CFLAGS="$old_CFLAGS" | ||
| 231 | +fi | ||
| 232 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_gnu89_inline" >&5 | ||
| 233 | +$as_echo "$ac_cv_cc_gnu89_inline" >&6; } | ||
| 234 | +if test "x$ac_cv_cc_gnu89_inline" = xyes; then : | ||
| 235 | + WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline" | ||
| 236 | +fi | ||
| 237 | + | ||
| 238 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --as-needed linker option" >&5 | ||
| 239 | +$as_echo_n "checking for --as-needed linker option... " >&6; } | ||
| 240 | +if test "${ac_cv_as_needed+set}" = set; then : | ||
| 241 | + $as_echo_n "(cached) " >&6 | ||
| 242 | +else | ||
| 243 | + cat > conftest.c <<EOF | ||
| 244 | +int main (void) { return 0; } | ||
| 245 | +EOF | ||
| 246 | +if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS | ||
| 247 | + -fPIC -shared -o conftest.so conftest.c | ||
| 248 | + -Wl,--as-needed 1>&5' | ||
| 249 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 | ||
| 250 | + (eval $ac_try) 2>&5 | ||
| 251 | + ac_status=$? | ||
| 252 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
| 253 | + test $ac_status = 0; }; } | ||
| 254 | +then | ||
| 255 | + ac_cv_as_needed=yes | ||
| 256 | +else | ||
| 257 | + ac_cv_as_needed=no | ||
| 258 | +fi | ||
| 259 | +rm -f conftest* | ||
| 260 | +fi | ||
| 261 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_as_needed" >&5 | ||
| 262 | +$as_echo "$ac_cv_as_needed" >&6; } | ||
| 263 | +if test "x$ac_cv_as_needed" = xyes; then : | ||
| 264 | + LD_AS_NEEDED=-Wl,--as-needed | ||
| 265 | +else | ||
| 266 | + LD_AS_NEEDED= | ||
| 267 | +fi | ||
| 268 | + | ||
| 269 | + | ||
| 270 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_popcount" >&5 | ||
| 271 | +$as_echo_n "checking for __builtin_popcount... " >&6; } | ||
| 272 | +if test "${ac_cv_popcount+set}" = set; then : | ||
| 273 | + $as_echo_n "(cached) " >&6 | ||
| 274 | +else | ||
| 275 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| 276 | +/* end confdefs.h. */ | ||
| 277 | + | ||
| 278 | +int | ||
| 279 | +main () | ||
| 280 | +{ | ||
| 281 | +exit (__builtin_popcount (127)); | ||
| 282 | + ; | ||
| 283 | + return 0; | ||
| 284 | +} | ||
| 285 | +_ACEOF | ||
| 286 | +if ac_fn_c_try_link "$LINENO"; then : | ||
| 287 | + ac_cv_popcount=yes | ||
| 288 | +else | ||
| 289 | + ac_cv_popcount=no | ||
| 290 | +fi | ||
| 291 | +rm -f core conftest.err conftest.$ac_objext \ | ||
| 292 | + conftest$ac_exeext conftest.$ac_ext | ||
| 293 | +fi | ||
| 294 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_popcount" >&5 | ||
| 295 | +$as_echo "$ac_cv_popcount" >&6; } | ||
| 296 | +if test "x$ac_cv_popcount" = xyes; then : | ||
| 297 | + | ||
| 298 | +$as_echo "#define HAVE_BUILTIN_POPCOUNT 1" >>confdefs.h | ||
| 299 | + | ||
| 300 | +fi | ||
| 301 | + | ||
| 302 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread support" >&5 | ||
| 303 | $as_echo_n "checking for __thread support... " >&6; } | ||
| 304 | if test "${ac_cv_tls+set}" = set; then : | ||
| 305 | @@ -3888,7 +4014,13 @@ | ||
| 306 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_tls" >&5 | ||
| 307 | $as_echo "$ac_cv_tls" >&6; } | ||
| 308 | if test "x$ac_cv_tls" != xyes; then : | ||
| 309 | - as_fn_error "__thread support required" "$LINENO" 5 | ||
| 310 | + if test "$use_locks" = yes; then : | ||
| 311 | + as_fn_error "--enable-thread-safety requires __thread support" "$LINENO" 5 | ||
| 312 | +else | ||
| 313 | + | ||
| 314 | +$as_echo "#define __thread /* empty: no multi-thread support */" >>confdefs.h | ||
| 315 | + | ||
| 316 | +fi | ||
| 317 | fi | ||
| 318 | |||
| 319 | # Check whether --enable-largefile was given. | ||
| 320 | @@ -4874,7 +5006,7 @@ | ||
| 321 | |||
| 322 | # 1.234<whatever> -> 1234<whatever> | ||
| 323 | case "$PACKAGE_VERSION" in | ||
| 324 | -[0-9].*) eu_version="${PACKAGE_VERSION/./}" ;; | ||
| 325 | +[0-9].*) eu_version=`echo "$PACKAGE_VERSION" | sed 's@\.@@'` ;; | ||
| 326 | *) as_fn_error "confused by version number '$PACKAGE_VERSION'" "$LINENO" 5 ;; | ||
| 327 | esac | ||
| 328 | case "$eu_version" in | ||
| 329 | @@ -4903,7 +5035,7 @@ | ||
| 330 | esac | ||
| 331 | |||
| 332 | # Round up to the next release API (x.y) version. | ||
| 333 | -eu_version=$[($eu_version + 999) / 1000] | ||
| 334 | +eu_version=`expr \( $eu_version + 999 \) / 1000` | ||
| 335 | |||
| 336 | cat >confcache <<\_ACEOF | ||
| 337 | # This file is a shell script that caches the results of configure | ||
