diff options
| author | B. Watson <yalhcru@gmail.com> | 2022-04-22 10:29:40 -0400 |
|---|---|---|
| committer | B. Watson <yalhcru@gmail.com> | 2022-04-22 10:29:40 -0400 |
| commit | 46194f342e4f700b7eb42cdba4a3be4ab19bb9a3 (patch) | |
| tree | 3436607a3e268a141e5439d78e83f49a2ae4b5d5 | |
| parent | 9695c972785d1785ae01484ab7d3be6f9d3ca2f8 (diff) | |
libraries/libeatmydata: Fix PRINT_PACKAGE_NAME.
Signed-off-by: B. Watson <yalhcru@gmail.com>
| -rw-r--r-- | libraries/libeatmydata/libeatmydata.SlackBuild | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/libraries/libeatmydata/libeatmydata.SlackBuild b/libraries/libeatmydata/libeatmydata.SlackBuild index 36bd30012d73..4e81af45b771 100644 --- a/libraries/libeatmydata/libeatmydata.SlackBuild +++ b/libraries/libeatmydata/libeatmydata.SlackBuild @@ -22,6 +22,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220422 bkw: Modified by SlackBuilds.org, BUILD=3: +# - Fix PRINT_PACKAGE_NAME. +# - i486 => i586. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libeatmydata @@ -30,28 +34,25 @@ BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -# 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 -fi - TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} 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 [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -75,9 +76,9 @@ cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ |