diff options
| -rwxr-xr-x | Configure | 2 | ||||
| -rw-r--r-- | Cross/Makefile-cross-SH | 2 | ||||
| -rw-r--r-- | MANIFEST | 1 | ||||
| -rwxr-xr-x | Makefile.SH | 2 | ||||
| -rw-r--r-- | hints/rhapsody.sh | 138 | ||||
| -rwxr-xr-x | installperl | 4 | ||||
| -rw-r--r-- | pod/perldelta.pod | 6 | ||||
| -rw-r--r-- | t/op/stat.t | 3 |
8 files changed, 8 insertions, 150 deletions
@@ -18708,7 +18708,7 @@ eval $setvar : Check if is a multiplatform env case "$osname" in -next|rhapsody|darwin) multiarch="$define" ;; +next|darwin) multiarch="$define" ;; esac case "$multiarch" in ''|[nN]*) multiarch="$undef" ;; diff --git a/Cross/Makefile-cross-SH b/Cross/Makefile-cross-SH index 65d7801f17..630774256a 100644 --- a/Cross/Makefile-cross-SH +++ b/Cross/Makefile-cross-SH @@ -53,7 +53,7 @@ true) -compatibility_version 1 -current_version $patchlevel \ -prebind -seg1addr 0x27000000 -install_name \$(shrpdir)/\$@" ;; - rhapsody*|darwin*) + darwin*) shrpldflags="${ldflags} -dynamiclib \ -compatibility_version \ ${api_revision}.${api_version}.${api_subversion} \ @@ -4179,7 +4179,6 @@ hints/posix-bc.sh Hints for named architecture hints/powerux.sh Hints for named architecture hints/qnx.sh Hints for named architecture hints/README.hints Notes about hints -hints/rhapsody.sh Hints for named architecture hints/riscos.sh Hints for named architecture hints/sco_2_3_0.sh Hints for named architecture hints/sco_2_3_1.sh Hints for named architecture diff --git a/Makefile.SH b/Makefile.SH index 33de34d143..19eaeb115b 100755 --- a/Makefile.SH +++ b/Makefile.SH @@ -61,7 +61,7 @@ true) -compatibility_version 1 -current_version $patchlevel \ -prebind -seg1addr 0x27000000 -install_name \$(shrpdir)/\$@" ;; - rhapsody*|darwin*) + darwin*) shrpldflags="${ldflags} -dynamiclib \ -compatibility_version \ ${api_revision}.${api_version}.${api_subversion} \ diff --git a/hints/rhapsody.sh b/hints/rhapsody.sh deleted file mode 100644 index 6151e7858d..0000000000 --- a/hints/rhapsody.sh +++ /dev/null @@ -1,138 +0,0 @@ -## -# Rhapsody (Mac OS X Server) hints -# Wilfredo Sanchez <wsanchez@wsanchez.net> -## - -## -# Paths -## - -# Configure hasn't figured out the version number yet. Bummer. -perl_revision=`awk '/define[ ]+PERL_REVISION/ {print $3}' $src/patchlevel.h` -perl_version=`awk '/define[ ]+PERL_VERSION/ {print $3}' $src/patchlevel.h` -perl_subversion=`awk '/define[ ]+PERL_SUBVERSION/ {print $3}' $src/patchlevel.h` -version="${perl_revision}.${perl_version}.${perl_subversion}" - -# BSD paths -case "$prefix" in - '') - # Default install; use non-system directories - prefix='/usr/local'; # Built-in perl uses /usr - siteprefix='/usr/local'; - vendorprefix='/usr'; usevendorprefix='define'; - - # Where to put modules. - sitelib="/Local/Library/Perl/${version}"; # FIXME: Want "/Network/Perl/${version}" also - vendorlib="/System/Library/Perl/${version}"; # Apple-supplied modules - ;; - - '/usr') - # We are building/replacing the built-in perl - siteprefix='/usr/local'; - vendorprefix='/usr/local'; usevendorprefix='define'; - - # Where to put modules. - sitelib="/Local/Library/Perl/${version}"; # FIXME: Want "/Network/Perl/${version}" also - vendorlib="/System/Library/Perl/${version}"; # Apple-supplied modules - ;; -esac - -## -# Tool chain settings -## - -# Since we can build fat, the archname doesn't need the processor type -archname='rhapsody'; - -# nm works. -usenm='true'; - -# Libc is in libsystem. -libc='/System/Library/Frameworks/System.framework/System'; - -# Optimize. -optimize='-O3'; - -# -fno-common because common symbols are not allowed in MH_DYLIB -ccflags="${ccflags} -fno-common" - -# Unverified whether this is necessary on Rhapsody, but the test shouldn't hurt. -# At least on Darwin 1.3.x: -# -# # define INT32_MIN -2147483648 -# int main () { -# double a = INT32_MIN; -# printf ("INT32_MIN=%g\n", a); -# return 0; -# } -# will output: -# INT32_MIN=2.14748e+09 -# Note that the INT32_MIN has become positive. -# INT32_MIN is set in /usr/include/stdint.h by: -# #define INT32_MIN -2147483648 -# which seems to break the gcc. Defining INT32_MIN as (-2147483647-1) -# seems to work. INT64_MIN seems to be similarly broken. -# -- Nicholas Clark, Ken Williams, and Edward Moy -# -case "$(grep '^#define INT32_MIN' /usr/include/stdint.h)" in - *-2147483648) ccflags="${ccflags} -DINT32_MIN_BROKEN -DINT64_MIN_BROKEN" ;; -esac - -# cpp-precomp is problematic. -cppflags='${cppflags} -traditional-cpp'; - -# This is necessary because perl's build system doesn't -# apply cppflags to cc compile lines as it should. -ccflags="${ccflags} ${cppflags}" - -# Shared library extension is .dylib. -# Bundle extension is .bundle. -ld='cc'; -so='dylib'; -dlext='bundle'; -dlsrc='dl_dyld.xs'; -usedl='define'; -cccdlflags=''; -lddlflags="${ldflags} -bundle -undefined suppress"; -ldlibpthname='DYLD_LIBRARY_PATH'; -useshrplib='true'; - -## -# System libraries -## - -# vfork works -usevfork='true'; - -# our malloc works (but allow users to override) -case "$usemymalloc" in -'') usemymalloc='n' ;; -esac - -# -# The libraries are not threadsafe in Rhapsody -# -# Fix when Apple fixes libc. -# -case "$usethreads$useithreads" in - *define*) - cat <<EOM >&4 - - - -*** Warning, there might be problems with your libraries with -*** regards to threading. The test ext/threads/t/libc.t is likely -*** to fail. - -EOM - ;; -esac - -## -# Build process -## - -# Case-insensitive filesystems don't get along with Makefile and -# makefile in the same place. Since Darwin uses GNU make, this dodges -# the problem. -firstmakefile=GNUmakefile; diff --git a/installperl b/installperl index 64a94ab48c..e64b1c39bf 100755 --- a/installperl +++ b/installperl @@ -385,7 +385,7 @@ foreach my $file (@corefiles) { # on dynamically-loadable libraries. So we do it for all. if (copy_if_diff($file,"$installarchlib/CORE/$file")) { if ($file =~ /\.(\Q$so\E|\Q$dlext\E)$/) { - strip("-S", "$installarchlib/CORE/$file") if $^O =~ /^(rhapsody|darwin)$/; + strip("-S", "$installarchlib/CORE/$file") if $^O eq 'darwin'; chmod(0555, "$installarchlib/CORE/$file"); } else { chmod(0444, "$installarchlib/CORE/$file"); @@ -777,7 +777,7 @@ sub installlib { # on dynamically-loaded libraries. if (copy_if_diff($_, "$installlib/$name")) { strip("-S", "$installlib/$name") - if $^O =~ /^(rhapsody|darwin)$/ and /\.(?:so|$dlext|a)$/; + if $^O eq 'darwin' and /\.(?:so|$dlext|a)$/; chmod(/\.(so|$dlext)$/ ? 0555 : 0444, "$installlib/$name"); } } diff --git a/pod/perldelta.pod b/pod/perldelta.pod index a43cf72071..e9f0e122a2 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -309,13 +309,11 @@ XXX =head2 Discontinued Platforms -XXX List any platforms that this version of perl no longer compiles on. - =over 4 -=item XXX-some-platform +=item Rhapsody -XXX +Support for Rhapsody has been removed. =back diff --git a/t/op/stat.t b/t/op/stat.t index c49aaf4e28..c5c74ca26c 100644 --- a/t/op/stat.t +++ b/t/op/stat.t @@ -38,7 +38,6 @@ $Is_Solaris = $^O eq 'solaris'; $Is_VMS = $^O eq 'VMS'; $Is_DGUX = $^O eq 'dgux'; $Is_MPRAS = $^O =~ /svr4/ && -f '/etc/.relid'; -$Is_Rhapsody= $^O eq 'rhapsody'; $Is_Dosish = $Is_Dos || $Is_OS2 || $Is_MSWin32 || $Is_NetWare; @@ -344,7 +343,7 @@ SKIP: { SKIP: { skip "These tests require a TTY", 4 if $ENV{PERL_SKIP_TTY_TEST}; - my $TTY = $Is_Rhapsody ? "/dev/ttyp0" : "/dev/tty"; + my $TTY = "/dev/tty"; SKIP: { skip "Test uses unixisms", 2 if $Is_MSWin32 || $Is_NetWare; |