Commits

Rodrigo Bistolfi committed 2e83aff

Apply patch from uelsk8s. Updated package.

Comments (0)

Files changed (6)

sbbuilder-0.4.12.2-noarch-5vl60.tlz

Binary file removed.

sbbuilder-0.4.12.3-noarch-1vl70.tlz

Binary file added.

usr/share/sbb/template/cflags

 if [[ "$ARCH" = i?86 ]]; then
   ARCH=i586
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  CONFIGURE_TRIPLET="i486-slackware-linux"
+  CONFIGURE_TRIPLET="i586-vector-linux"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fpic"
   CONFIGURE_TRIPLET="x86_64-vlocity-linux"
+  LIBDIRSUFFIX="64"
 elif [ "$ARCH" = "powerpc" ]; then
   SLKCFLAGS="-O2"
   CONFIGURE_TRIPLET="powerpc-vlocity-linux"
+  LIBDIRSUFFIX=""
 fi
 
 export CFLAGS="$SLKCFLAGS $CFLAG_OPTIONS"

usr/share/sbb/template/configure.cmake

 # Build
 cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr \
 	-DBUILD_SHARED_LIBS:BOOL=ON \
+	-DLIBRARY_OUTPUT_PATH:PATH=/usr/lib${LIBDIRSUFFIX}
 	-DSYSCONFDIR:PATH=/etc \
 	$CONFIG_OPTIONS || exit 1
 

usr/share/sbb/template/configure.default

 [%- UNLESS noconfig %]
 [%- SET configure = 
 './configure --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX}
+  --infodir=/usr/info
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \

usr/share/sbb/template/makepkg

 #--------------------------------------------------------------
 echo "Finding dependencies..."
 ADD="$ADDRB" EXCLUDE="$EXRB" requiredbuilder -v -y -s $RELEASEDIR $PKG
-echo "Creating package $NAME-$VERSION-$ARCH-$BUILD.tlz"
-makepkg -l y -c n $RELEASEDIR/$NAME-$VERSION-$ARCH-$BUILD.tlz
+echo "Creating package $NAME-$VERSION-$ARCH-$BUILD.txz"
+makepkg -l y -c n $RELEASEDIR/$NAME-$VERSION-$ARCH-$BUILD.txz
 
 cd $CWD
 echo "Cleaning up temp files..." && rm -rf $TMP