diff options
| author | B. Watson <yalhcru@gmail.com> | 2022-02-09 02:39:46 -0500 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-02-12 00:29:36 +0700 |
| commit | 5806b53fe628fa46326a2c603805f4e7e2daf3d7 (patch) | |
| tree | 5f21f18059ae87a6d9b3d2d40f52af46ec649aa1 /libraries/libb64 | |
| parent | 884faa6a4cd4a41a5d2b925b552811bbe2d0d442 (diff) | |
| download | slackbuilds-5806b53fe628fa46326a2c603805f4e7e2daf3d7.tar.gz | |
libraries/libb64: Fix 15.0 build.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries/libb64')
| -rw-r--r-- | libraries/libb64/libb64.SlackBuild | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libraries/libb64/libb64.SlackBuild b/libraries/libb64/libb64.SlackBuild index 34f303a949..93923597d9 100644 --- a/libraries/libb64/libb64.SlackBuild +++ b/libraries/libb64/libb64.SlackBuild @@ -22,6 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220209 bkw: Modified by SlackBuilds.org, to fix the build on 15.0. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libb64 @@ -32,15 +34,12 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -50,8 +49,10 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +# 20220209 bkw: src/Makefile has "CFLAGS += -O3" which overrides our +# -O2. Not going to "fix" it. +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -84,7 +85,8 @@ sed -i 's|-Werror||' */Makefile # Build shared library. patch -p0 < $CWD/shared-library.patch -CFLAGS="$SLKCFLAGS" make +# 20220209 bkw: leave the -j1 here please, it's necessary. +CFLAGS="$SLKCFLAGS" make -j1 # Manually install. mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} |