Use --strip-unneeded-rel-relocs for OS4 releases

jens-maus · Oct 29, 2021 · 2efc984 · 2efc984
1 parent c9cf4eb
commit 2efc984
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,6 +40,7 @@ jobs:
         curl -L ${DOWNLOAD_PATH}/adtools-utils.tar.bz2 | sudo tar xj -C /
         if [[ ${{ matrix.platform }} =~ os3-68020|os3-68060|release|nightly ]]; then curl -L ${DOWNLOAD_PATH}/adtools-m68k-amigaos.tar.bz2 | sudo tar xj -C / ; fi
         if [[ ${{ matrix.platform }} =~ os4|release|nightly ]]; then curl -L ${DOWNLOAD_PATH}/adtools-ppc-amigaos-legacy.tar.bz2 | sudo tar xj -C / ; fi
+        if [[ ${{ matrix.platform }} =~ os4|release|nightly ]]; then curl -L ${DOWNLOAD_PATH}/adtools-ppc-amigaos.tar.bz2 | sudo tar xj -C / ; fi
         #if [[ ${{ matrix.platform }} =~ mos|release|nightly ]]; then curl -L ${DOWNLOAD_PATH}/adtools-ppc-morphos.tar.bz2 | sudo tar xj -C / ; fi
         #if [[ ${{ matrix.platform }} =~ aros-ppc|release|nightly ]]; then curl -L ${DOWNLOAD_PATH}/adtools-ppc-aros.tar.bz2 | sudo tar xj -C / ; fi
         #if [[ ${{ matrix.platform }} =~ aros-i386|release|nightly ]]; then curl -L ${DOWNLOAD_PATH}/adtools-i386-aros.tar.bz2 | sudo tar xj -C / ; fi
@@ -52,6 +53,7 @@ jobs:
     - name: build ${{ matrix.platform }}-${{ matrix.build }}
       timeout-minutes: 480
       run: |
+        rm /usr/local/amiga/bin/ppc-amigaos-strip
         export PATH=/usr/local/amiga/bin:/opt/m68k-amigaos/bin:/opt/ppc-amigaos/bin:/opt/ppc-morphos/bin:${PATH}
         if [[ ${{ matrix.build }} =~ release ]]; then make -j1 OS=${{ matrix.platform }} DEBUG= ; fi
         if [[ ${{ matrix.build }} =~ debug ]]; then make -j1 OS=${{ matrix.platform }} ; fi

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -92,6 +92,7 @@ jobs:
         curl -L ${DOWNLOAD_PATH}/adtools-utils.tar.bz2 | sudo tar xj -C /
         curl -L ${DOWNLOAD_PATH}/adtools-m68k-amigaos.tar.bz2 | sudo tar xj -C /
         curl -L ${DOWNLOAD_PATH}/adtools-ppc-amigaos-legacy.tar.bz2 | sudo tar xj -C /
+        curl -L ${DOWNLOAD_PATH}/adtools-ppc-amigaos-legacy.tar.bz2 | sudo tar xj -C /
         #curl -L ${DOWNLOAD_PATH}/adtools-ppc-morphos.tar.bz2 | sudo tar xj -C /
         #curl -L ${DOWNLOAD_PATH}/adtools-ppc-aros.tar.bz2 | sudo tar xj -C /
         #curl -L ${DOWNLOAD_PATH}/adtools-i386-aros.tar.bz2 | sudo tar xj -C /
@@ -104,6 +105,7 @@ jobs:
     - name: build AmiSSL release
       timeout-minutes: 480
       run: |
+        rm /usr/local/amiga/bin/ppc-amigaos-strip
         export PATH=/usr/local/amiga/bin:/opt/m68k-amigaos/bin:/opt/ppc-amigaos/bin:/opt/ppc-morphos/bin:${PATH}
         make -j1 release
 

diff --git a/tools/mkrelease.sh b/tools/mkrelease.sh
@@ -27,7 +27,7 @@ for os in ${OS}; do
 	case $os in
 	    os3-68020)   fullsys="AmigaOS3" strip="m68k-amigaos-strip" libdir="/68020-40";;
 	    os3-68060)   fullsys="AmigaOS3" strip="m68k-amigaos-strip" libdir="/68060";;
-	    os4)         fullsys="AmigaOS4" strip="ppc-amigaos-strip";;
+	    os4)         fullsys="AmigaOS4" strip="ppc-amigaos-strip --strip-unneeded-rel-relocs";;
 	    mos)         fullsys="MorphOS"  strip="ppc-morphos-strip";;
 	    aros-i386)   fullsys="AROS-i386";;
 	    aros-ppc)    fullsys="AROS-ppc";;