From 45fd6a15c43d5dd2131aeeff43c57be2a920a080 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Thu, 3 Feb 2005 18:55:43 +0000 Subject: [PATCH] * config/ltmain.m4sh (func_generate_dlsyms): Fix broken subdir path computation, exposed by using `-dlopen self'. Fix broken sed script exposed by additionally using `-export-symbols FILE'. --- ChangeLog | 7 +++++++ config/ltmain.m4sh | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index e3fc486ce..1faf499f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-02-03 Reid Spencer , + Ralf Wildenhues + + * config/ltmain.m4sh (func_generate_dlsyms): Fix broken subdir + path computation, exposed by using `-dlopen self'. Fix broken + sed script exposed by additionally using `-export-symbols FILE'. + 2005-02-03 Ralf Wildenhues * THANKS: Update. diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh index b58efa4ca..a7bfb0e6e 100644 --- a/config/ltmain.m4sh +++ b/config/ltmain.m4sh @@ -756,24 +756,24 @@ extern \"C\" { # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols="$output_objdir/$output.exp" + export_symbols="$output_objdir/$outputname.exp" $run $RM $export_symbols $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in *cygwin* | *mingw* ) - $run eval "${ECHO} EXPORTS "'> "$output_objdir/$output.def"' - $run eval 'cat "$export_symbols" >> "$output_objdir/$output.def"' + $run eval "${ECHO} EXPORTS "'> "$output_objdir/$outputname.def"' + $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' ;; esac else - $run eval "${SED} -e 's/\([[]][[.*^$]]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' + $run eval "${SED} -e 's/\([[ ]][[.*^$]]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' case $host in *cygwin | *mingw* ) - $run eval "${ECHO} EXPORTS "'> "$output_objdir/$output.def"' - $run eval 'cat "$output_objdir/$output.exp" >> "$output_objdir/$output.def"' + $run eval "${ECHO} EXPORTS "'> "$output_objdir/$outputname.def"' + $run eval 'cat "$output_objdir/$outputname.exp" >> "$output_objdir/$outputname.def"' ;; esac - $run eval '$GREP -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' + $run eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' $run eval '$MV "$nlist"T "$nlist"' fi fi -- 2.47.2