From c2e41518bab5adbfa706b1d2daee56a2603f6b7e Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Mon, 22 Aug 2011 23:12:14 +0400 Subject: [PATCH] Remove the ancient non-integrated patches from README.DGUX386 file. * doc/README.DGUX386: Fix a typo. * doc/README.DGUX386: Remove patches for ltconfig and ltmain.sh; add a note about the removal (the patches could be viewed via "git diff" for this commit). --- doc/README.DGUX386 | 167 +---------------------------------------------------- 1 file changed, 2 insertions(+), 165 deletions(-) diff --git a/doc/README.DGUX386 b/doc/README.DGUX386 index 8960b94..19e90da 100644 --- a/doc/README.DGUX386 +++ b/doc/README.DGUX386 @@ -24,7 +24,7 @@ To enable debugging messages please do: 1) Add the "--enable-gc-debug" flag during configuration. - 2) Edit the file linux-threads.c and uncommnect the line: + 2) Edit the file linux-threads.c and uncomment the line: /* #define DEBUG_THREADS 1 */ to ---> @@ -49,167 +49,4 @@ Note (HB): The following patches against 6.1alpha3 where hard to move to alpha4, and are not integrated. There may also be minor problems with stylistic corrections made by me. - - ---- ltconfig.ORIG Mon Jan 28 20:22:18 2002 -+++ ltconfig Mon Jan 28 20:44:00 2002 -@@ -689,6 +689,11 @@ - pic_flag=-Kconform_pic - fi - ;; -+ dgux*) -+ pic_flag='-fPIC' -+ link_static='-Bstatic' -+ wl='-Wl,' -+ ;; - *) - pic_flag='-fPIC' - ;; -@@ -718,6 +723,12 @@ - # We can build DLLs from non-PIC. - ;; - -+ dgux*) -+ pic_flag='-KPIC' -+ link_static='-Bstatic' -+ wl='-Wl,' -+ ;; -+ - osf3* | osf4* | osf5*) - # All OSF/1 code is PIC. - wl='-Wl,' -@@ -1154,6 +1165,22 @@ - fi - ;; - -+ dgux*) -+ ld_shlibs=yes -+ # For both C/C++ ommit the deplibs. This is because we relying on the fact -+ # that compilation of execitables will put them in correct order -+ # in any case and sometimes are wrong when listed as deplibs (or missing some deplibs) -+ # However when GNU ld and --whole-archive needs to be used we have the problem -+ # that if the -fPIC *_s.a archive is linked through deplibs list we ommiting crucial -+ # .lo/.o files from the created shared lib. This I think is not the case here. -+ archive_cmds='$CC -shared -h $soname -o $lib $libobjs $linkopts' -+ thread_safe_flag_spec='-pthread' -+ wlarc= -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_shlibpath_var=no -+ ac_cv_archive_cmds_needs_lc=no -+ ;; -+ - cygwin* | mingw*) - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -@@ -1497,7 +1524,7 @@ - ;; - - dgux*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' -+ archive_cmds='$CC -shared -h $soname -o $lib $libobjs $linkopts' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; -@@ -2092,12 +2119,17 @@ - ;; - - dgux*) -- version_type=linux -+ version_type=dgux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='$libname.so$versuffix' -+ soname_spec='$libname.so$versuffix' - shlibpath_var=LD_LIBRARY_PATH -+ thread_safe_flag_spec='-pthread' -+ wlarc= -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_shlibpath_var=no -+ ac_cv_archive_cmds_needs_lc=no - ;; - - sysv4*MP*) - - ---- ltmain.sh.ORIG Mon Jan 28 20:31:18 2002 -+++ ltmain.sh Tue Jan 29 00:11:29 2002 -@@ -1072,11 +1072,38 @@ - esac - ;; - -+ -thread*) -+ # DG/UX GCC 2.95.x, 3.x.x rev (DG/UX) links -lthread -+ # with the switch -threads -+ if test "$arg" = "-threads"; then -+ case "$host" in -+ i[3456]86-*-dgux*) -+ deplibs="$deplibs $arg" -+ continue -+ ;; -+ esac -+ fi -+ ;; -+ -+ -pthread*) -+ # DG/UX GCC 2.95.x, 3.x.x rev (DG/UX) links -lthread -+ # with the switch -pthread -+ if test "$arg" = "-pthread"; then -+ case "$host" in -+ i[3456]86-*-dgux*) -+ deplibs="$deplibs $arg" -+ continue -+ ;; -+ esac -+ fi -+ ;; -+ - -l*) - if test "$arg" = "-lc"; then - case "$host" in -- *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) -+ *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos* | i[3456]86-*-dgux*) - # These systems don't actually have c library (as such) -+ # It is wrong in DG/UX to add -lc when creating shared/dynamic objs/libs - continue - ;; - esac -@@ -1248,6 +1275,12 @@ - temp_deplibs= - for deplib in $dependency_libs; do - case "$deplib" in -+ -thread*) -+ temp_deplibs="$temp_deplibs $deplib" -+ ;; -+ -pthread) -+ temp_deplibs="$temp_deplibs $deplib" -+ ;; - -R*) temp_xrpath=`$echo "X$deplib" | $Xsed -e 's/^-R//'` - case " $rpath $xrpath " in - *" $temp_xrpath "*) ;; -@@ -1709,6 +1742,13 @@ - done - ;; - -+ dgux) -+ # Leave mostly blank for DG/UX -+ major= -+ versuffix=".$current.$revision"; -+ verstring= -+ ;; -+ - linux) - major=.`expr $current - $age` - versuffix="$major.$age.$revision" -@@ -1792,8 +1832,9 @@ - - dependency_libs="$deplibs" - case "$host" in -- *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) -+ *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos* | i[3456]86-*-dgux*) - # these systems don't actually have a c library (as such)! -+ # It is wrong in DG/UX to add -lc when creating shared/dynamic objs/libs - ;; - *) - # Add libc to deplibs on all other systems. +[The diff for ltconfig and ltmain.sh was removed from this file on 2011-08-22] -- 2.7.4