pkgs/by-name/to/tomboy-ng/simplify-build-script.patch

   1 diff --git a/buildit.bash b/buildit.bash
   2 index 6606562..57b9e14 100755
   3 --- a/buildit.bash
   4 +++ b/buildit.bash
   5 @@ -61,7 +61,7 @@ EXCLUDEMESSAGE=" -vm6058,2005,5027 "  # cut down on compiler noise
   6  # 6058 - note about things not being inlined
   7  # 5027 - var not used
   8  # 2005 - level 2 comment
   9 -FPCHARD=" -Cg  -k-pie -k-znow "
  10 +FPCHARD=""
  11  AUTODOWNLOAD=FALSE                     # downloading large file, use -d to allow it
  12
  13  # ------------------------ Some functions ------------------------
  14 @@ -180,8 +180,6 @@ if [ "$CPU" = "powerpc64le" ]; then # power does not like intel switches !
  15  fi
  16
  17  TARGET="$CPU-$OS"
  18 -CheckFPC
  19 -CheckLazBuild
  20  CheckForQt5
  21
  22  # OK, if to here, we have a fpc and lazbuild, but which FPC ?
  23 @@ -228,8 +226,8 @@ cd "$K_DIR"         # WARNING, kcontrols is not part of the github zip file, its added
  24
  25  # Here we build just the kmemo.pas part of kcontrols.
  26
  27 -mkdir -p "lib/$TARGET"                 # this is where kcontrols object files end up.
  28 -rm -f "lib/$CPU-$OS/kmemo.o"    # make sure we try to build a new one, but probably not there.
  29 +OUTPUT=$(mktemp -d)
  30 +mkdir -p "$OUTPUT/lib/$TARGET"
  31
  32  FPCKOPT=" -B -MObjFPC -Scgi -Cg -O1 -g -gl -l -vewnibq -vh- $EXCLUDEMESSAGES -Fi$K_DIR"
  33  FPCKUNITS=" -Fu$LAZ_DIR/packager/units/$TARGET -Fu$LAZ_DIR/components/lazutils/lib/$TARGET"
  34 @@ -237,7 +235,7 @@ FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/buildintf/units/$TARGET -Fu$LAZ_DIR
  35  FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/lib/$TARGET -Fu$LAZ_DIR/lcl/units/$TARGET -Fu$LAZ_DIR/lcl/units/$TARGET/$WIDGET"
  36  FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/cairocanvas/lib/$TARGET/$WIDGET -Fu$LAZ_DIR/components/lazcontrols/lib/$TARGET/$WIDGET"
  37  FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/ideintf/units/$TARGET/$WIDGET -Fu$LAZ_DIR/components/printers/lib/$TARGET/$WIDGET"
  38 -FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/tdbf/lib/$TARGET/$WIDGET -Fu. -FUlib/$TARGET"
  39 +FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/tdbf/lib/$TARGET/$WIDGET -Fu. -FU$OUTPUT/lib/$TARGET"
  40
  41  RUNIT="$COMPILER $EXCLUDEMESSAGE $FPCKOPT  $FPCHARD $LAZUNITSRC  $FPCKUNITS kmemo.pas"
  42
  43 @@ -245,12 +243,12 @@ echo "--------------- kcontrols COMPILE COMMAND -------------"
  44  echo "$RUNIT"
  45  echo "-----------------"
  46
  47 -$RUNIT 1>tomboy-ng.log
  48 +$RUNIT
  49
  50  # exit
  51
  52
  53 -if [ ! -e "$K_DIR/lib/$CPU-$OS/kmemo.o" ]; then
  54 +if [ ! -e "$OUTPUT/lib/$CPU-$OS/kmemo.o" ]; then
  55         echo "ERROR failed to build KControls, exiting..."
  56         K_DIR=""
  57         exit 1
  58 @@ -301,7 +299,7 @@ UNITS="$UNITS -Fu$LAZ_DIR/lcl/units/$TARGET"
  59  UNITS="$UNITS -Fu$LAZ_DIR/packager/units/$TARGET"
  60
  61  UNITS="$UNITS -Fu$SOURCE_DIR/"
  62 -UNITS="$UNITS -FU$SOURCE_DIR/lib/$TARGET/"
  63 +UNITS="$UNITS -FU$OUTPUT/lib/$TARGET/"
  64
  65  OPT2=" -dLCL -dLCL$WIDGET"
  66  DEFS="-dDisableLCLGIF -dDisableLCLJPEG -dDisableLCLPNM -dDisableLCLTIFF"
  67 @@ -322,11 +320,10 @@ RUNIT="$COMPILER $OPT1 $FPCHARD $UNITS $LAZUNITSRC $OPT2 $DEFS $PROJ.lpr"
  68  echo "------------ tomboy-ng COMPILE COMMAND --------------------"
  69  echo "$RUNIT"
  70
  71 -TOMBOY_NG_VER="$VERSION" $RUNIT 1>>tomboy-ng.log
  72 +TOMBOY_NG_VER="$VERSION" $RUNIT
  73
  74  if [ ! -e "$PROJ" ]; then
  75      echo "======================== ERROR, COMPILE FAILED source/tomboy-ng.log ====="
  76 -    cat tomboy-ng.log
  77      echo "=========================================================== END of LOG =="
  78      exit 1
  79  else