[Libreoffice-commits] core.git: download.lst external/freetype

2023-02-24 Thread Taichi Haradaguchi (via logerrit)
 download.lst   |4 +--
 external/freetype/freetype-2.6.5.patch.1   |   36 ++---
 external/freetype/freetype-fd-hack.patch.0 |7 ++---
 external/freetype/ubsan.patch  |   17 ++---
 4 files changed, 26 insertions(+), 38 deletions(-)

New commits:
commit 803e3a63d879d8095b53b020cb648522fcb2af99
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Tue Feb 21 20:14:33 2023 +0900
Commit: Caolán McNamara 
CommitDate: Fri Feb 24 10:44:05 2023 +

freetype: upgrade to release 2.13.0

As the issue has been fixed upstream[1], removed some codes from 
"external/freetype/ubsan.patch".

[1]"[truetype] Fix undefined pointer arithmetic."



Change-Id: I66c11e414cd9ecdad8678487d0c3f645a352ad92
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147464
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index 0ba8412a5ca6..49f98fae9188 100644
--- a/download.lst
+++ b/download.lst
@@ -197,8 +197,8 @@ FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-FREETYPE_SHA256SUM := 
ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033
-FREETYPE_TARBALL := freetype-2.12.0.tar.xz
+FREETYPE_SHA256SUM := 
5ee23abd047636c24b2d43c6625dcafc1d1aca64dec9e0d05df29592624c
+FREETYPE_TARBALL := freetype-2.13.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/freetype/freetype-2.6.5.patch.1 
b/external/freetype/freetype-2.6.5.patch.1
index c10c0bb38ea8..544e4fa496a6 100644
--- a/external/freetype/freetype-2.6.5.patch.1
+++ b/external/freetype/freetype-2.6.5.patch.1
@@ -1,7 +1,7 @@
 diff -up freetype/builds/unix/configure.dt freetype/builds/unix/configure
 freetype/builds/unix/configure.dt  2017-02-01 22:14:45.206257952 +0100
-+++ freetype/builds/unix/configure 2017-02-01 22:16:31.076183707 +0100
-@@ -9386,7 +9386,7 @@
+--- freetype/builds/unix/configure.dt  2023-02-09 15:33:17.0 +0900
 freetype/builds/unix/configure 2023-02-22 16:53:49.547740397 +0900
+@@ -9523,7 +9523,7 @@ _LT_EOF
case $host_cpu in
powerpc)
  # see comment about AmigaOS4 .so support
@@ -10,7 +10,7 @@ diff -up freetype/builds/unix/configure.dt 
freetype/builds/unix/configure
  archive_expsym_cmds=''
  ;;
m68k)
-@@ -9402,7 +9402,7 @@
+@@ -9539,7 +9539,7 @@ _LT_EOF
allow_undefined_flag=unsupported
# Joseph Beckenbach  says some releases of gcc
# support --undefined.  This deserves some investigation.  FIXME
@@ -19,7 +19,7 @@ diff -up freetype/builds/unix/configure.dt 
freetype/builds/unix/configure
else
ld_shlibs=no
fi
-@@ -9436,7 +9436,7 @@
+@@ -9573,7 +9573,7 @@ _LT_EOF
;;
  
  haiku*)
@@ -28,7 +28,7 @@ diff -up freetype/builds/unix/configure.dt 
freetype/builds/unix/configure
link_all_deplibs=yes
;;
  
-@@ -9531,13 +9531,13 @@
+@@ -9669,13 +9669,13 @@ _LT_EOF
*Sun\ F*)   # Sun Fortran 8.3
  tmp_sharedflag='-G' ;;
esac
@@ -37,14 +37,14 @@ diff -up freetype/builds/unix/configure.dt 
freetype/builds/unix/configure
  
  if test yes = "$supports_anon_versioning"; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> 
$output_objdir/$libname.ver~
+ cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> 
$output_objdir/$libname.ver~
  echo "local: *; };" >> $output_objdir/$libname.ver~
 -$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs 
$compiler_flags $wl-soname $wl$soname $wl-version-script 
$wl$output_objdir/$libname.ver -o $lib'
 +$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs 
$compiler_flags $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
  fi
  
case $cc_basename in
-@@ -9567,8 +9567,8 @@
+@@ -9705,8 +9705,8 @@ _LT_EOF
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
@@ -55,7 +55,7 @@ diff -up freetype/builds/unix/configure.dt 
freetype/builds/unix/configure
fi
;;
  
-@@ -9586,8 +9586,8 @@
+@@ -9724,8 +9724,8 @@ _LT_EOF
  
  _LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; 
then
@@ -66,7 +66,7 @@ diff -up freetype/builds/unix/configure.dt 
freetype/builds/unix/configure
else
ld_shlibs=no
fi
-@@ -9615,8 +9615,8 @@
+@@ -9753,8 +9753,8 @@ _LT_EOF
  # requires that you compile everything twice, which is a pain.
  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; 
then

[Libreoffice-commits] core.git: download.lst external/freetype

2022-11-16 Thread Miklos Vajna (via logerrit)
 download.lst  |4 -
 external/freetype/ubsan.patch |  114 --
 2 files changed, 2 insertions(+), 116 deletions(-)

New commits:
commit 7229a380d3d607dc896e1d48b1a13f7b301aef80
Author: Miklos Vajna 
AuthorDate: Wed Nov 16 13:37:33 2022 +0100
Commit: Miklos Vajna 
CommitDate: Wed Nov 16 14:47:29 2022 +0100

Update freetype to 2.12.0

- fixes CVE-2022-27404
- dropped the no longer applying parts of ubsan.patch

Change-Id: Ia8a496d53b62f68a27dbd9be08c89273b6bd01cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142768
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/download.lst b/download.lst
index bc899a047dfd..452f4ad97f54 100644
--- a/download.lst
+++ b/download.lst
@@ -90,8 +90,8 @@ export FONT_SCHEHERAZADE_SHA256SUM := 
251c8817ceb87d9b661ce1d5b49e732a0116add10a
 export FONT_SCHEHERAZADE_TARBALL := Scheherazade-2.100.zip
 export FREEHAND_SHA256SUM := 
0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac
 export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
-export FREETYPE_SHA256SUM := 
ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8
-export FREETYPE_TARBALL := freetype-2.11.1.tar.xz
+export FREETYPE_SHA256SUM := 
ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033
+export FREETYPE_TARBALL := freetype-2.12.0.tar.xz
 export GLM_SHA256SUM := 
6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad
 export GLM_TARBALL := glm-0.9.9.8.zip
 export GPGME_SHA256SUM := 
6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0
diff --git a/external/freetype/ubsan.patch b/external/freetype/ubsan.patch
index 236ef023bf1b..c8173eeff531 100644
--- a/external/freetype/ubsan.patch
+++ b/external/freetype/ubsan.patch
@@ -1,117 +1,3 @@
 src/autofit/afcjk.c
-+++ src/autofit/afcjk.c
-@@ -843,7 +843,7 @@
-   {
- AF_AxisHints  axis  = >axis[dim];
- AF_Segmentsegments  = axis->segments;
--AF_Segmentsegment_limit = segments + axis->num_segments;
-+AF_Segmentsegment_limit = axis->num_segments == 0 ? segments : 
segments + axis->num_segments;
- AF_Direction  major_dir = axis->major_dir;
- AF_Segmentseg1, seg2;
- FT_Poslen_threshold;
-@@ -1005,7 +1005,7 @@
- AF_CJKAxislaxis  = &((AF_CJKMetrics)hints->metrics)->axis[dim];
- 
- AF_Segmentsegments  = axis->segments;
--AF_Segmentsegment_limit = segments + axis->num_segments;
-+AF_Segmentsegment_limit = axis->num_segments == 0 ? segments : 
segments + axis->num_segments;
- AF_Segmentseg;
- 
- FT_Fixed  scale;
-@@ -1153,7 +1153,7 @@
-  */
- {
-   AF_Edge  edges  = axis->edges;
--  AF_Edge  edge_limit = edges + axis->num_edges;
-+  AF_Edge  edge_limit = axis->num_edges == 0 ? edges : edges + 
axis->num_edges;
-   AF_Edge  edge;
- 
- 
-@@ -1291,7 +1291,7 @@
-   {
- AF_AxisHints  axis   = >axis[dim];
- AF_Edge   edge   = axis->edges;
--AF_Edge   edge_limit = edge + axis->num_edges;
-+AF_Edge   edge_limit = axis->num_edges == 0 ? edge : edge + 
axis->num_edges;
- AF_CJKAxiscjk= >axis[dim];
- FT_Fixed  scale  = cjk->scale;
- FT_Posbest_dist0;  /* initial threshold */
-@@ -1798,7 +1798,7 @@
-   {
- AF_AxisHints  axis   = >axis[dim];
- AF_Edge   edges  = axis->edges;
--AF_Edge   edge_limit = edges + axis->num_edges;
-+AF_Edge   edge_limit = axis->num_edges == 0 ? edges : edges + 
axis->num_edges;
- FT_PtrDistn_edges;
- AF_Edge   edge;
- AF_Edge   anchor   = NULL;
-@@ -2177,7 +2177,7 @@
-   {
- AF_AxisHints  axis   = & hints->axis[dim];
- AF_Edge   edges  = axis->edges;
--AF_Edge   edge_limit = edges + axis->num_edges;
-+AF_Edge   edge_limit = axis->num_edges == 0 ? edges : edges + 
axis->num_edges;
- AF_Edge   edge;
- FT_Bool   snapping;
- 
 src/autofit/afhints.c
-+++ src/autofit/afhints.c
-@@ -1316,7 +1316,7 @@
-   {
- AF_AxisHints  axis  = & hints->axis[dim];
- AF_Segmentsegments  = axis->segments;
--AF_Segmentsegment_limit = segments + axis->num_segments;
-+AF_Segmentsegment_limit = axis->num_segments == 0 ? segments : 
segments + axis->num_segments;
- AF_Segmentseg;
- 
- 
-@@ -1393,7 +1393,7 @@
- AF_Point  point_limit = points + hints->num_points;
- AF_AxisHints  axis= >axis[dim];
- AF_Edge   edges   = axis->edges;
--AF_Edge   edge_limit  = edges + axis->num_edges;
-+AF_Edge   edge_limit  = axis->num_edges == 0 ? edges : edges + 
axis->num_edges;
- FT_UInt   touch_flag;
- 
- 
 src/autofit/aflatin.c
-+++ src/autofit/aflatin.c
-@@ -1989,7 +1989,7 @@
-   {
- AF_AxisHints  axis  = >axis[dim];
- AF_Segmentsegments  = axis->segments;
--AF_Segment

[Libreoffice-commits] core.git: download.lst external/freetype

2022-01-06 Thread Caolán McNamara (via logerrit)
 download.lst |4 +-
 external/freetype/freetype-2.6.5.patch.1 |   45 +++
 2 files changed, 24 insertions(+), 25 deletions(-)

New commits:
commit 72dfa7ec4c3cae074c9769cc99fe1b7eb029de43
Author: Caolán McNamara 
AuthorDate: Thu Jan 6 09:09:53 2022 +
Commit: Caolán McNamara 
CommitDate: Thu Jan 6 15:00:58 2022 +0100

upgrade freetype to latest release

Change-Id: I2b13aceffd9932978c98c49bc688bd5f71690523
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128035
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index 47db7add2e70..06126a0bc290 100644
--- a/download.lst
+++ b/download.lst
@@ -92,8 +92,8 @@ export FONT_SCHEHERAZADE_SHA256SUM := 
251c8817ceb87d9b661ce1d5b49e732a0116add10a
 export FONT_SCHEHERAZADE_TARBALL := Scheherazade-2.100.zip
 export FREEHAND_SHA256SUM := 
0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac
 export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
-export FREETYPE_SHA256SUM := 
8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7
-export FREETYPE_TARBALL := freetype-2.11.0.tar.xz
+export FREETYPE_SHA256SUM := 
ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8
+export FREETYPE_TARBALL := freetype-2.11.1.tar.xz
 export GLM_SHA256SUM := 
6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad
 export GLM_TARBALL := glm-0.9.9.8.zip
 export GPGME_SHA256SUM := 
6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0
diff --git a/external/freetype/freetype-2.6.5.patch.1 
b/external/freetype/freetype-2.6.5.patch.1
index faae4bafddd4..c10c0bb38ea8 100644
--- a/external/freetype/freetype-2.6.5.patch.1
+++ b/external/freetype/freetype-2.6.5.patch.1
@@ -1,7 +1,7 @@
 diff -up freetype/builds/unix/configure.dt freetype/builds/unix/configure
 --- freetype/builds/unix/configure.dt  2017-02-01 22:14:45.206257952 +0100
 +++ freetype/builds/unix/configure 2017-02-01 22:16:31.076183707 +0100
-@@ -8887,7 +8887,7 @@
+@@ -9386,7 +9386,7 @@
case $host_cpu in
powerpc)
  # see comment about AmigaOS4 .so support
@@ -10,7 +10,7 @@ diff -up freetype/builds/unix/configure.dt 
freetype/builds/unix/configure
  archive_expsym_cmds=''
  ;;
m68k)
-@@ -8903,7 +8903,7 @@
+@@ -9402,7 +9402,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach  says some releases of gcc
# support --undefined.  This deserves some investigation.  FIXME
@@ -19,7 +19,7 @@ diff -up freetype/builds/unix/configure.dt 
freetype/builds/unix/configure
else
ld_shlibs=no
fi
-@@ -8937,7 +8937,7 @@
+@@ -9436,7 +9436,7 @@
;;
  
  haiku*)
@@ -28,7 +28,7 @@ diff -up freetype/builds/unix/configure.dt 
freetype/builds/unix/configure
link_all_deplibs=yes
;;
  
-@@ -9032,13 +9032,13 @@
+@@ -9531,13 +9531,13 @@
*Sun\ F*)   # Sun Fortran 8.3
  tmp_sharedflag='-G' ;;
esac
@@ -44,7 +44,7 @@ diff -up freetype/builds/unix/configure.dt 
freetype/builds/unix/configure
  fi
  
case $cc_basename in
-@@ -9068,8 +9068,8 @@
+@@ -9567,8 +9567,8 @@
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
@@ -55,7 +55,7 @@ diff -up freetype/builds/unix/configure.dt 
freetype/builds/unix/configure
fi
;;
  
-@@ -9087,8 +9087,8 @@
+@@ -9586,8 +9586,8 @@
  
  _LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; 
then
@@ -66,7 +66,7 @@ diff -up freetype/builds/unix/configure.dt 
freetype/builds/unix/configure
else
ld_shlibs=no
fi
-@@ -9116,8 +9116,8 @@
+@@ -9615,8 +9615,8 @@
  # requires that you compile everything twice, which is a pain.
  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; 
then
hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
@@ -77,7 +77,7 @@ diff -up freetype/builds/unix/configure.dt 
freetype/builds/unix/configure
  else
ld_shlibs=no
  fi
-@@ -9134,8 +9134,8 @@
+@@ -9633,8 +9633,8 @@
  
  *)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; 
then
@@ -88,7 +88,7 @@ diff -up freetype/builds/unix/configure.dt 
freetype/builds/unix/configure
else
ld_shlibs=no
fi
-@@ -9434,7 +9434,7 @@
+@@ -9937,7 +9937,7 @@
case $host_cpu in
powerpc)
  # see comment about AmigaOS4 .so support
@@ -97,7 +97,7 @@ diff -up freetype/builds/unix/configure.dt 
freetype/builds/unix/configure
  archive_expsym_cmds=''
  ;;
m68k)
-@@ -9703,7 +9703,7 @@
+@@ -10207,7 +10207,7 @@
  
  irix5* | irix6* | nonstopux*)
if test yes = "$GCC"; then
@@ -106,16 +106,16 @@ diff -up freetype/builds/unix/configure.dt 
freetype/builds/unix/configure
# Try to use the -exported_symbol ld 

[Libreoffice-commits] core.git: download.lst external/freetype RepositoryExternal.mk

2017-02-01 Thread David Tardon
 RepositoryExternal.mk|7 
 download.lst |3 
 external/freetype/ExternalProject_freetype.mk|5 
 external/freetype/UnpackedTarball_freetype.mk|4 
 external/freetype/freetype-2.4.8.patch   |   20 --
 external/freetype/freetype-2.6.5.patch.1 |  158 +++
 external/freetype/freetype-msvc-disable-sse2.patch.1 |   57 --
 7 files changed, 206 insertions(+), 48 deletions(-)

New commits:
commit cc96f0c841961961f9274c4717419da8d5d27533
Author: David Tardon 
Date:   Wed Feb 1 12:32:35 2017 +0100

upload freetype 2.7.1

Change-Id: I8da4395cefe6bb542ab7cac2a849ec587a63f37c
Reviewed-on: https://gerrit.libreoffice.org/33814
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 13c9ddf..b00776c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1474,6 +1474,8 @@ $(call gb_LinkTarget_add_libs,$(1),$(HARFBUZZ_LIBS))
 
 endef
 
+gb_ExternalProject__use_harfbuzz :=
+
 else # SYSTEM_HARFBUZZ != TRUE
 
 define gb_LinkTarget__use_harfbuzz
@@ -1486,6 +1488,11 @@ $(call gb_LinkTarget_use_external_project,$(1),harfbuzz)
 
 endef
 
+define gb_ExternalProject__use_harfbuzz
+$(call gb_ExternalProject_use_external_project,$(1),harfbuzz)
+
+endef
+
 endif # SYSTEM_HARFBUZZ
 
 ifeq ($(DISABLE_OPENSSL),TRUE)
diff --git a/download.lst b/download.lst
index bf2ac36..2a67327 100644
--- a/download.lst
+++ b/download.lst
@@ -55,7 +55,8 @@ export FONT_EMOJIONE_COLOR_MD5SUM := 
919389b307ee8696288ea3b8210ab974
 export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz
 export FREEHAND_MD5SUM := 8cf70c5dc4d24d2dc4a107f509d2d6d7
 export FREEHAND_TARBALL := libfreehand-0.1.1.tar.bz2
-export FREETYPE_TARBALL := 
dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2
+export FREETYPE_MD5SUM := b3230110e0cab777e0df7631837ac36e
+export FREETYPE_TARBALL := freetype-2.7.1.tar.bz2
 export GLM_TARBALL := 
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
 export GRAPHITE_TARBALL := 
3069842a88b8f40c6b83ad2850cda293-graphite2-minimal-1.3.9.tgz
 export HARFBUZZ_MD5SUM := 5986e1bfcd983d1f6caa53ef64c4abc5
diff --git a/external/freetype/ExternalProject_freetype.mk 
b/external/freetype/ExternalProject_freetype.mk
index 2353030..b12303c6 100644
--- a/external/freetype/ExternalProject_freetype.mk
+++ b/external/freetype/ExternalProject_freetype.mk
@@ -9,6 +9,10 @@
 
 $(eval $(call gb_ExternalProject_ExternalProject,freetype))
 
+$(eval $(call gb_ExternalProject_use_externals,freetype,\
+   harfbuzz \
+))
+
 $(eval $(call gb_ExternalProject_register_targets,freetype,\
build \
 ))
@@ -29,7 +33,6 @@ $(call gb_ExternalProject_get_state_target,freetype,build) :
--prefix=$(call 
gb_UnpackedTarball_get_dir,freetype/instdir) \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" \
-   && chmod +x builds/unix/freetype-config \
&& $(MAKE) install \
&& touch $@ )
 endif
diff --git a/external/freetype/UnpackedTarball_freetype.mk 
b/external/freetype/UnpackedTarball_freetype.mk
index 769d39a..847ae6f 100644
--- a/external/freetype/UnpackedTarball_freetype.mk
+++ b/external/freetype/UnpackedTarball_freetype.mk
@@ -11,10 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,freetype))
 
 $(eval $(call 
gb_UnpackedTarball_set_tarball,freetype,$(FREETYPE_TARBALL),,freetype))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,freetype,3))
-
 $(eval $(call gb_UnpackedTarball_add_patches,freetype,\
-   external/freetype/freetype-2.4.8.patch \
+   external/freetype/freetype-2.6.5.patch.1 \
external/freetype/freetype-msvc-disable-sse2.patch.1 \
 ))
 
diff --git a/external/freetype/freetype-2.4.8.patch 
b/external/freetype/freetype-2.4.8.patch
deleted file mode 100644
index 9ae69a3..000
--- a/external/freetype/freetype-2.4.8.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 misc/build/freetype-2.4.8/builds/unix/configure
-+++ misc/build/freetype-2.4.8/builds/unix/configure
-@@ -3619,7 +3619,7 @@
- 
- if test "x$GCC" = xyes; then
-   XX_CFLAGS="-Wall"
--  XX_ANSIFLAGS="-pedantic -ansi"
-+  XX_ANSIFLAGS=
- else
-   case "$host" in
-   *-dec-osf*)
-@@ -10039,7 +10039,7 @@
-   *Sun\ F*)   # Sun Fortran 8.3
- tmp_sharedflag='-G' ;;
-   esac
--  archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname -o $lib'
-+  archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs 
$compiler_flags -o $lib'
- 
- if test "x$supports_anon_versioning" = xyes; then
-   archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
diff --git