fix(build): fix dependency linking and system header conflicts

- Support `lib64` library paths for OpenSSL and Curl static libraries.
- Configure `CURL_CFLAGS` and `CURL_LIBS` explicitly with `-DCURL_STATICLIB` to ensure proper static linking.
- Strip `-I/usr/include` from generated PHP Makefile to prevent conflicts with custom dependency headers.
- Export `OPENSSL_CFLAGS` to the build environment to ensure correct header resolution.

Author: hightemp

internal/build/php.go

@@ -128,6 +128,11 @@ func (b *Builder) Build(ctx context.Context, opts BuildOptions) error {
 	if err := b.configure(ctx, version, sourceDir, buildDir, installDir); err != nil {
 		return fmt.Errorf("configure: %w", err)
 	}
+	if deps.NeedsDeps(version) {
+		if err := stripSystemInclude(buildDir); err != nil {
+			return fmt.Errorf("patch makefile includes: %w", err)
+		}
+	}
 
 	// Build
 	if err := b.make(ctx, version, buildDir); err != nil {
@@ -272,6 +277,22 @@ func (b *Builder) configure(ctx context.Context, version, sourceDir, buildDir, i
 	return nil
 }
 
+func stripSystemInclude(buildDir string) error {
+	makefilePath := filepath.Join(buildDir, "Makefile")
+	content, err := os.ReadFile(makefilePath)
+	if err != nil {
+		return err
+	}
+
+	updated := strings.ReplaceAll(string(content), "CFLAGS_CLEAN = -I/usr/include ", "CFLAGS_CLEAN = ")
+	updated = strings.ReplaceAll(updated, "CFLAGS_CLEAN = -I/usr/include", "CFLAGS_CLEAN =")
+	if updated == string(content) {
+		return nil
+	}
+
+	return os.WriteFile(makefilePath, []byte(updated), 0644)
+}
+
 // make runs make.
 func (b *Builder) make(ctx context.Context, version, buildDir string) error {
 	log.Info("Building (this may take a while)...")

internal/deps/deps.go

@@ -426,6 +426,7 @@ func (m *DepsManager) GetBuildEnv(phpVersion string) []string {
 	var ldflags []string
 	var cflags []string
 	var libs []string
+	var opensslCflags []string
 	var env []string
 
 	for _, dep := range deps {
@@ -456,25 +457,56 @@ func (m *DepsManager) GetBuildEnv(phpVersion string) []string {
 
 		// Add explicit static library paths for OpenSSL
 		if dep.Name == "openssl" {
-			libssl := filepath.Join(prefix, "lib", "libssl.a")
-			libcrypto := filepath.Join(prefix, "lib", "libcrypto.a")
+			libDir := filepath.Join(prefix, "lib")
+			libDir64 := filepath.Join(prefix, "lib64")
+			libssl := filepath.Join(libDir, "libssl.a")
+			libcrypto := filepath.Join(libDir, "libcrypto.a")
+			if !fsutil.Exists(libssl) || !fsutil.Exists(libcrypto) {
+				libssl = filepath.Join(libDir64, "libssl.a")
+				libcrypto = filepath.Join(libDir64, "libcrypto.a")
+			}
 			if fsutil.Exists(libssl) && fsutil.Exists(libcrypto) {
 				libs = append(libs, libssl, libcrypto, "-ldl", "-lpthread")
 			}
+			includeDir := filepath.Join(prefix, "include")
+			if fsutil.Exists(includeDir) {
+				opensslCflags = append(opensslCflags, "-I"+includeDir)
+			}
 		}
 
 		// Add curl library with OpenSSL dependencies
 		if dep.Name == "curl" {
 			opensslPrefix := filepath.Join(depsDir, "openssl")
-			libssl := filepath.Join(opensslPrefix, "lib", "libssl.a")
-			libcrypto := filepath.Join(opensslPrefix, "lib", "libcrypto.a")
-			libcurl := filepath.Join(prefix, "lib", "libcurl.a")
-			if fsutil.Exists(libcurl) && fsutil.Exists(libssl) && fsutil.Exists(libcrypto) {
-				// Add curl libs with its OpenSSL dependencies
-				curlLibs := fmt.Sprintf("-L%s/lib %s %s %s -ldl -lpthread -lz",
-					prefix, libcurl, libssl, libcrypto)
+			libDir := filepath.Join(prefix, "lib")
+			libDir64 := filepath.Join(prefix, "lib64")
+			curlLibDir := libDir
+			libcurl := filepath.Join(curlLibDir, "libcurl.a")
+			if !fsutil.Exists(libcurl) {
+				curlLibDir = libDir64
+				libcurl = filepath.Join(curlLibDir, "libcurl.a")
+			}
+
+			opensslLibDir := filepath.Join(opensslPrefix, "lib")
+			opensslLibDir64 := filepath.Join(opensslPrefix, "lib64")
+			libssl := filepath.Join(opensslLibDir, "libssl.a")
+			libcrypto := filepath.Join(opensslLibDir, "libcrypto.a")
+			if !fsutil.Exists(libssl) || !fsutil.Exists(libcrypto) {
+				libssl = filepath.Join(opensslLibDir64, "libssl.a")
+				libcrypto = filepath.Join(opensslLibDir64, "libcrypto.a")
+			}
+
+			if fsutil.Exists(libcurl) {
+				// Override pkg-config to control link order for static libcurl.
+				curlCflags := fmt.Sprintf("-I%s/include -DCURL_STATICLIB", prefix)
+				curlLibs := fmt.Sprintf("-L%s -lcurl", curlLibDir)
+				env = append(env, "CURL_CFLAGS="+curlCflags)
 				env = append(env, "CURL_LIBS="+curlLibs)
 			}
+
+			// Ensure OpenSSL libs are available in LIBS (appended at end by configure).
+			if fsutil.Exists(libssl) && fsutil.Exists(libcrypto) {
+				libs = append(libs, libssl, libcrypto, "-ldl", "-lpthread", "-lz")
+			}
 		}
 	}
 
@@ -517,6 +549,15 @@ func (m *DepsManager) GetBuildEnv(phpVersion string) []string {
 		env = append(env, "LIBS="+libsStr)
 	}
 
+	if len(opensslCflags) > 0 {
+		existing := os.Getenv("OPENSSL_CFLAGS")
+		newFlags := strings.Join(opensslCflags, " ")
+		if existing != "" {
+			newFlags = newFlags + " " + existing
+		}
+		env = append(env, "OPENSSL_CFLAGS="+newFlags)
+	}
+
 	return env
 }