Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb748d8f

Browse files
committed
Fix install-strip on Mac OS X
There was a hack put into install-sh to call strip with the correctoptions on Mac OS X. But that never worked, because configuredisabled stripping on that platform altogether. So remove that deadcode, and while we're at it, update install-sh to the latest upstreamsource (from Automake).Instead, set up the right strip options in programs.m4, so this nowactually works the way it was originally intended.
1 parent5c45d2f commitb748d8f

File tree

3 files changed

+50
-29
lines changed

3 files changed

+50
-29
lines changed

‎config/install-sh

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
#!/bin/sh
22
# install - install a program, script, or datafile
33

4-
# config/install-sh
5-
6-
scriptversion=2009-08-26.20
4+
scriptversion=2011-11-20.07;# UTC
75

86
# This originates from X11R5 (mit/util/scripts/install.sh), which was
97
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -37,7 +35,7 @@ scriptversion=2009-08-26.20
3735
# FSF changes to this file are in the public domain.
3836
#
3937
# Calling this script install-sh is preferred over install.sh, to prevent
40-
#`make' implicit rules from creating a file called install from it
38+
#'make' implicit rules from creating a file called install from it
4139
# when there is no Makefile.
4240
#
4341
# This script is compatible with the BSD install script, but was written
@@ -69,12 +67,6 @@ mkdirprog=${MKDIRPROG-mkdir}
6967
mvprog=${MVPROG-mv}
7068
rmprog=${RMPROG-rm}
7169
stripprog=${STRIPPROG-strip}
72-
# Darwin normal strip removes symbols from shared libraries that are
73-
# later needed for dynamic linking, so use strip -x.
74-
# http://archives.postgresql.org/pgsql-hackers/2007-10/msg01470.php
75-
case`uname -s`in
76-
Darwin) stripprog="${STRIPPROG-strip -x}";;
77-
esac
7870

7971
posix_glob='?'
8072
initialize_posix_glob='
@@ -164,6 +156,10 @@ while test $# -ne 0; do
164156
-s) stripcmd=$stripprog;;
165157

166158
-t) dst_arg=$2
159+
# Protect names problematic for 'test' and other utilities.
160+
case$dst_argin
161+
-* | [=\(\)!]) dst_arg=./$dst_arg;;
162+
esac
167163
shift;;
168164

169165
-T) no_target_directory=true;;
@@ -194,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
194190
fi
195191
shift# arg
196192
dst_arg=$arg
193+
# Protect names problematic for 'test' and other utilities.
194+
case$dst_argin
195+
-* | [=\(\)!]) dst_arg=./$dst_arg;;
196+
esac
197197
done
198198
fi
199199

@@ -202,13 +202,17 @@ if test $# -eq 0; then
202202
echo"$0: no input file specified.">&2
203203
exit 1
204204
fi
205-
# It's OK to call`install-sh -d' without argument.
205+
# It's OK to call'install-sh -d' without argument.
206206
# This can happen when creating conditional directories.
207207
exit 0
208208
fi
209209

210210
iftest -z"$dir_arg";then
211-
trap'(exit $?); exit' 1 2 13 15
211+
do_exit='(exit $ret); exit $ret'
212+
trap"ret=129;$do_exit" 1
213+
trap"ret=130;$do_exit" 2
214+
trap"ret=141;$do_exit" 13
215+
trap"ret=143;$do_exit" 15
212216

213217
# Set umask so as not to create temps with too-generous modes.
214218
# However, 'strip' requires both read and write access to temps.
@@ -236,9 +240,9 @@ fi
236240

237241
for src
238242
do
239-
# Protect namesstarting with `-'.
243+
# Protect namesproblematic for 'test' and other utilities.
240244
case$srcin
241-
-*) src=./$src;;
245+
-* | [=\(\)!]) src=./$src;;
242246
esac
243247

244248
iftest -n"$dir_arg";then
@@ -260,12 +264,7 @@ do
260264
echo"$0: no destination specified.">&2
261265
exit 1
262266
fi
263-
264267
dst=$dst_arg
265-
# Protect names starting with `-'.
266-
case$dstin
267-
-*) dst=./$dst;;
268-
esac
269268

270269
# If destination is a directory, append the input filename; won't work
271270
# if double slashes aren't ignored.
@@ -355,7 +354,7 @@ do
355354
iftest -z"$dir_arg"|| {
356355
# Check for POSIX incompatibilities with -m.
357356
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
358-
# other-writeable bit of parent directory when it shouldn't.
357+
# other-writable bit of parent directory when it shouldn't.
359358
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
360359
ls_ld_tmpdir=`ls -ld"$tmpdir"`
361360
case$ls_ld_tmpdirin
@@ -393,7 +392,7 @@ do
393392

394393
case$dstdirin
395394
/*) prefix='/';;
396-
-*) prefix='./';;
395+
[-=\(\)!]*) prefix='./';;
397396
*) prefix='';;
398397
esac
399398

@@ -411,7 +410,7 @@ do
411410

412411
for d
413412
do
414-
test-z"$d"&&continue
413+
testX"$d" = X&&continue
415414

416415
prefix=$prefix$d
417416
iftest -d"$prefix";then
@@ -523,5 +522,6 @@ done
523522
# eval: (add-hook 'write-file-hooks 'time-stamp)
524523
# time-stamp-start: "scriptversion="
525524
# time-stamp-format: "%:y-%02m-%02d.%02H"
526-
# time-stamp-end: "$"
525+
# time-stamp-time-zone: "UTC"
526+
# time-stamp-end: "; # UTC"
527527
# End:

‎config/programs.m4

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,19 @@ AC_DEFUN([PGAC_CHECK_STRIP],
218218
STRIP_SHARED_LIB="$STRIP --strip-unneeded"
219219
AC_MSG_RESULT(yes)
220220
else
221-
STRIP_STATIC_LIB=:
222-
STRIP_SHARED_LIB=:
223-
AC_MSG_RESULT(no)
221+
case $host_os in
222+
darwin*)
223+
STRIP="$STRIP -x"
224+
STRIP_STATIC_LIB=$STRIP
225+
STRIP_SHARED_LIB=$STRIP
226+
AC_MSG_RESULT(yes)
227+
;;
228+
*)
229+
STRIP_STATIC_LIB=:
230+
STRIP_SHARED_LIB=:
231+
AC_MSG_RESULT(no)
232+
;;
233+
esac
224234
fi
225235
AC_SUBST(STRIP_STATIC_LIB)
226236
AC_SUBST(STRIP_SHARED_LIB)

‎configure

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6480,10 +6480,21 @@ $as_echo_n "checking whether it is possible to strip libraries... " >&6; }
64806480
{ $as_echo "$as_me:$LINENO: result: yes" >&5
64816481
$as_echo "yes" >&6; }
64826482
else
6483-
STRIP_STATIC_LIB=:
6484-
STRIP_SHARED_LIB=:
6485-
{ $as_echo "$as_me:$LINENO: result: no" >&5
6483+
case $host_os in
6484+
darwin*)
6485+
STRIP="$STRIP -x"
6486+
STRIP_STATIC_LIB=$STRIP
6487+
STRIP_SHARED_LIB=$STRIP
6488+
{ $as_echo "$as_me:$LINENO: result: yes" >&5
6489+
$as_echo "yes" >&6; }
6490+
;;
6491+
*)
6492+
STRIP_STATIC_LIB=:
6493+
STRIP_SHARED_LIB=:
6494+
{ $as_echo "$as_me:$LINENO: result: no" >&5
64866495
$as_echo "no" >&6; }
6496+
;;
6497+
esac
64876498
fi
64886499

64896500

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp