diff options
| author |   B. Watson <yalhcru@gmail.com> | 2022-03-14 16:09:55 -0400 |
|---|---|---|
| committer | B. Watson <yalhcru@gmail.com> | 2022-03-17 12:38:15 -0400 |
| commit | 44dcfc2a858a0857092239f679266069bba76eb9 (patch) | |
| tree | 27f620daa5b0cf53af3c3c5e5c3344fd1fcb1706 /perl | |
| parent | 6b512cb169bb6e64991c11c5e3b362e39b3c73a2 (diff) | |
| download | slackbuilds-44dcfc2a858a0857092239f679266069bba76eb9.tar.gz slackbuilds-44dcfc2a858a0857092239f679266069bba76eb9.tar.xz | |
perl/perl-X11-Protocol-Other: Disable test by default (requires X).
Signed-off-by: B. Watson <yalhcru@gmail.com>
Diffstat (limited to 'perl')
| -rw-r--r-- | perl/perl-X11-Protocol-Other/README | 10 | ||||
| -rw-r--r-- | perl/perl-X11-Protocol-Other/perl-X11-Protocol-Other.SlackBuild | 19 |
2 files changed, 19 insertions, 10 deletions
diff --git a/perl/perl-X11-Protocol-Other/README b/perl/perl-X11-Protocol-Other/README index 2cb5681c2c..8f5a4bc5b3 100644 --- a/perl/perl-X11-Protocol-Other/README +++ b/perl/perl-X11-Protocol-Other/README @@ -1,3 +1,11 @@ -This is some window manager related functions for use by client +These are some window manager related functions for use by client programs, as per the "Inter-Client Communication Conventions Manual" and some of the Net-WM "Extended Window Manager Hints". + +Note: normally, SlackBuilds that build perl modules include the +"make test" command. Here, it's disabled by default, as it will +cause the build to fail if there is no X server running (or if X's +DISPLAY variable isn't set). If you want to enable the tests, export +MAKETEST=yes in the script's environment. Note that the test will +leave your desktop with a solid black background (replacing whatever +wallpaper you might have had). diff --git a/perl/perl-X11-Protocol-Other/perl-X11-Protocol-Other.SlackBuild b/perl/perl-X11-Protocol-Other/perl-X11-Protocol-Other.SlackBuild index 80298ecc45..49a78c6f2b 100644 --- a/perl/perl-X11-Protocol-Other/perl-X11-Protocol-Other.SlackBuild +++ b/perl/perl-X11-Protocol-Other/perl-X11-Protocol-Other.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. +# 20220314 bkw: Modified by SlackBuilds.org: disable 'make test' by +# default, since it requires a running X server, and even then it +# messes up the display. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=perl-X11-Protocol-Other @@ -34,15 +38,12 @@ SRCNAM="$(printf $PRGNAM | cut -d- -f2-)" 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 @@ -52,8 +53,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -77,9 +78,9 @@ cd $SRCNAM-$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 \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ perl Makefile.PL \ PREFIX=/usr \ @@ -87,7 +88,7 @@ perl Makefile.PL \ INSTALLVENDORMAN3DIR=/usr/man/man3 \ INSTALLVENDORMAN1DIR=/usr/man/man1 make -make test +[ "${MAKETEST:-no}" = "yes" ] && make test make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ |