diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-08-02 19:46:52 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-08-02 19:46:52 +0000 |
| commit | ad7d264cf96a7aee5484cdf39c40142dd8402483 (patch) | |
| tree | 4d95fa68d94a2724b031c6e7712f7df24abb0ba2 | |
| parent | c9173f24170602fb2ea07f19a2cf825ce52cb873 (diff) | |
Hack to make redhat/gcc-4_1-branch libgcj.so* use different SONAME
from gcc-4_1-branch and gcc-4_2-branch.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/redhat/gcc-4_1-branch@115880 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/libtool-version | 2 | ||||
| -rw-r--r-- | ltmain.sh | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libjava/libtool-version b/libjava/libtool-version index 9f34f83595e..114060c10fb 100644 --- a/libjava/libtool-version +++ b/libjava/libtool-version @@ -3,4 +3,4 @@ # a separate file so that version updates don't involve re-running # automake. # CURRENT:REVISION:AGE -7:0:0 +7rh:0:0 diff --git a/ltmain.sh b/ltmain.sh index 474423aaf10..562c32487d4 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -2589,7 +2589,7 @@ EOF # Check that each of the things are valid numbers. case $current in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; + 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9] | [1-9]rh | [1-9][0-9]rh) ;; *) $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 @@ -2615,7 +2615,7 @@ EOF ;; esac - if test $age -gt $current; then + if test $age != 0 && test $age -gt $current; then $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit 1 @@ -2666,7 +2666,11 @@ EOF ;; linux) - major=.`expr $current - $age` + if test $age = 0; then + major=.$current + else + major=.`expr $current - $age` + fi versuffix="$major.$age.$revision" ;; |