Skip to content

Commit 71b9e82

Browse files
committed
chore: wip
1 parent 07497d2 commit 71b9e82

File tree

1 file changed

+48
-2
lines changed

1 file changed

+48
-2
lines changed

.github/workflows/build-binaries.yml

Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,12 +307,18 @@ jobs:
307307
BZIP2_PATH="$LAUNCHPAD_BZIP2_DIR/$BZIP2_VERSION"
308308
echo "Found launchpad bzip2 at: $BZIP2_PATH"
309309
310-
# Check multiple possible locations for bzlib.h
310+
# Check multiple possible locations for bzlib.h
311311
BZLIB_FOUND=false
312312
for include_path in "$BZIP2_PATH/include/bzlib.h" "$BZIP2_PATH/include/bzip2/bzlib.h" "$BZIP2_PATH/bzlib.h"; do
313313
if [[ -f "$include_path" ]]; then
314314
echo "✓ bzlib.h found at $include_path"
315-
EXTRA_CONFIG="$EXTRA_CONFIG --with-bz2=$BZIP2_PATH"
315+
# Only add if the path is not empty
316+
if [[ -n "$BZIP2_PATH" ]]; then
317+
EXTRA_CONFIG="$EXTRA_CONFIG --with-bz2=$BZIP2_PATH"
318+
echo "Added --with-bz2=$BZIP2_PATH"
319+
else
320+
echo "⚠️ BZIP2_PATH is empty, skipping --with-bz2 option"
321+
fi
316322
BZLIB_FOUND=true
317323
break
318324
fi
@@ -531,6 +537,30 @@ jobs:
531537
done
532538
EXTRA_CONFIG="$FINAL_EXTRA_CONFIG"
533539
echo "Final EXTRA_CONFIG: $EXTRA_CONFIG"
540+
541+
# Final check: ensure no empty or problematic options remain
542+
echo "Final validation of EXTRA_CONFIG:"
543+
FINAL_VALIDATED_CONFIG=""
544+
for option in $EXTRA_CONFIG; do
545+
# Skip completely empty options
546+
if [[ -z "$option" ]]; then
547+
echo "Removing empty option"
548+
continue
549+
fi
550+
# Skip options that are just whitespace
551+
if [[ -z "${option// }" ]]; then
552+
echo "Removing whitespace-only option"
553+
continue
554+
fi
555+
# Skip options that might cause issues (like --with-bz2 without value)
556+
if [[ "$option" =~ ^--with-[^=]+$ ]]; then
557+
echo "Removing option without value: $option"
558+
continue
559+
fi
560+
FINAL_VALIDATED_CONFIG="$FINAL_VALIDATED_CONFIG $option"
561+
done
562+
EXTRA_CONFIG="$FINAL_VALIDATED_CONFIG"
563+
echo "Final validated EXTRA_CONFIG: $EXTRA_CONFIG"
534564
fi
535565
536566
echo "Configuring PHP with:"
@@ -544,6 +574,22 @@ jobs:
544574
echo "Final configure command will be:"
545575
echo "./configure --prefix=\"$INSTALL_PREFIX\" --disable-debug --enable-shared --with-pic ${{ env.CONFIGURE_EXTENSIONS }} $EXTRA_CONFIG $CURL_CONFIG"
546576
577+
# Debug: Show each argument separately
578+
echo "Debug: Breaking down configure arguments:"
579+
echo " --prefix=\"$INSTALL_PREFIX\""
580+
echo " --disable-debug"
581+
echo " --enable-shared"
582+
echo " --with-pic"
583+
echo " CONFIGURE_EXTENSIONS: ${{ env.CONFIGURE_EXTENSIONS }}"
584+
echo " EXTRA_CONFIG: $EXTRA_CONFIG"
585+
echo " CURL_CONFIG: $CURL_CONFIG"
586+
587+
# Debug: Show each EXTRA_CONFIG option separately
588+
echo "Debug: EXTRA_CONFIG options:"
589+
for option in $EXTRA_CONFIG; do
590+
echo " '$option'"
591+
done
592+
547593
# Debug: Show available pkg-config files
548594
echo "Available pkg-config files:"
549595
pkg-config --list-all | grep -i curl || echo "No curl pkg-config found"

0 commit comments

Comments
 (0)