Bug#985946: patch proposal

[Frédéric Bonnard]

Here is a patch proposal which fixes the build.
The patch header details the issue and the possible workaround.
Regards,

F.



--- a/buildit.bash
+++ b/buildit.bash
@@ -156,6 +156,9 @@
     CPU="i386"
 fi
 TARGET="$CPU-$OS"
+if [ "$CPU" = "powerpc64le" ]; then
+    CPU="powerpc64"
+fi
 CheckFPC
 CheckLazBuild
 CheckForQt5
@@ -193,12 +196,12 @@
 
 FPCHARD=" -Cg  -k-pie -k-znow "
 FPCKOPT=" -MObjFPC -Scgi -Cg -O1 -g -gl -l -vewnibq -vh- -Fi$K_DIR"
-FPCKUNITS=" -Fu$LAZ_DIR/packager/units/$TARGET 
-Fu$LAZ_DIR/components/lazutils/lib/$TARGET"
-FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/buildintf/units/$TARGET 
-Fu$LAZ_DIR/components/freetype/lib/$TARGET"
-FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/lib/$TARGET -Fu$LAZ_DIR/lcl/units/$TARGET 
-Fu$LAZ_DIR/lcl/units/$TARGET/$WIDGET"
-FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/cairocanvas/lib/$TARGET/$WIDGET 
-Fu$LAZ_DIR/components/lazcontrols/lib/$TARGET/$WIDGET"
-FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/ideintf/units/$TARGET/$WIDGET 
-Fu$LAZ_DIR/components/printers/lib/$TARGET/$WIDGET"
-FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/tdbf/lib/$TARGET/$WIDGET -Fu. 
-FUlib/$TARGET"
+FPCKUNITS=" -Fu$LAZ_DIR/packager/units/$CPU-$OS 
-Fu$LAZ_DIR/components/lazutils/lib/$CPU-$OS"
+FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/buildintf/units/$CPU-$OS 
-Fu$LAZ_DIR/components/freetype/lib/$CPU-$OS"
+FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/lib/$CPU-$OS -Fu$LAZ_DIR/lcl/units/$CPU-$OS 
-Fu$LAZ_DIR/lcl/units/$CPU-$OS/$WIDGET"
+FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/cairocanvas/lib/$CPU-$OS/$WIDGET 
-Fu$LAZ_DIR/components/lazcontrols/lib/$CPU-$OS/$WIDGET"
+FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/ideintf/units/$CPU-$OS/$WIDGET 
-Fu$LAZ_DIR/components/printers/lib/$CPU-$OS/$WIDGET"
+FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/tdbf/lib/$CPU-$OS/$WIDGET -Fu. 
-FUlib/$TARGET"
 
 RUNIT="$COMPILER $EXCLUDEMESSAGE $FPCKOPT  $FPCHARD   $FPCKUNITS kmemo.pas"
 
@@ -210,7 +213,7 @@
 # exit
 
 
-if [ ! -e "$K_DIR/lib/$CPU-$OS/kmemo.o" ]; then
+if [ ! -e "$K_DIR/lib/$TARGET/kmemo.o" ]; then
        echo "ERROR failed to build KControls, exiting..."
        K_DIR=""
        exit 1
@@ -254,15 +257,15 @@
 OPT1="-MObjFPC -Scghi -CX -Cg -O3 -XX -Xs -l -vewnibq $EXCLUDEMESSAGE 
-Fi$SOURCE_DIR/lib/$TARGET"
 
 UNITS="$UNITS -Fu$K_DIR/lib/$TARGET"
-UNITS="$UNITS -Fu$LAZ_DIR/components/tdbf/lib/$TARGET/$WIDGET"
-UNITS="$UNITS -Fu$LAZ_DIR/components/printers/lib/$TARGET/$WIDGET"
-UNITS="$UNITS -Fu$LAZ_DIR/components/cairocanvas/lib/$TARGET/$WIDGET"
-UNITS="$UNITS -Fu$LAZ_DIR/components/lazcontrols/lib/$TARGET/$WIDGET"
-UNITS="$UNITS -Fu$LAZ_DIR/components/lazutils/lib/$TARGET"
-UNITS="$UNITS -Fu$LAZ_DIR/components/ideintf/units/$TARGET/$WIDGET"
-UNITS="$UNITS -Fu$LAZ_DIR/lcl/units/$TARGET/$WIDGET"
-UNITS="$UNITS -Fu$LAZ_DIR/lcl/units/$TARGET"
-UNITS="$UNITS -Fu$LAZ_DIR/packager/units/$TARGET"
+UNITS="$UNITS -Fu$LAZ_DIR/components/tdbf/lib/$CPU-$OS/$WIDGET"
+UNITS="$UNITS -Fu$LAZ_DIR/components/printers/lib/$CPU-$OS/$WIDGET"
+UNITS="$UNITS -Fu$LAZ_DIR/components/cairocanvas/lib/$CPU-$OS/$WIDGET"
+UNITS="$UNITS -Fu$LAZ_DIR/components/lazcontrols/lib/$CPU-$OS/$WIDGET"
+UNITS="$UNITS -Fu$LAZ_DIR/components/lazutils/lib/$CPU-$OS"
+UNITS="$UNITS -Fu$LAZ_DIR/components/ideintf/units/$CPU-$OS/$WIDGET"
+UNITS="$UNITS -Fu$LAZ_DIR/lcl/units/$CPU-$OS/$WIDGET"
+UNITS="$UNITS -Fu$LAZ_DIR/lcl/units/$CPU-$OS"
+UNITS="$UNITS -Fu$LAZ_DIR/packager/units/$CPU-$OS"
 
 UNITS="$UNITS -Fu$SOURCE_DIR/"
 UNITS="$UNITS -FU$SOURCE_DIR/lib/$TARGET/" 

signature.asc
Description: PGP signature