wip

Author: mxcl

brewkit/build-template.ts

@@ -98,6 +98,7 @@ if (Deno.build.os != "windows") {
     prefix,
     deps_prefixes,
     dstdir,
+    PKGX_DIR,
     process_fixup,
   );
 }

brewkit/fixup.ts

@@ -14,6 +14,7 @@ export default async function default_fixups(
   prefix: Path,
   dep_prefixes: Path[],
   PKGX_DIR: Path,
+  original_PKGX_DIR: Path,
   process: (path: Path) => boolean = () => true,
 ) {
   // fix pkgs putting man at the root rather than in `share`
@@ -88,7 +89,7 @@ export default async function default_fixups(
           switch (path.extname()) {
             case ".pc":
               {
-                await fix_pkg_config_file(path, prefix);
+                await fix_pkg_config_file(path, prefix, PKGX_DIR, original_PKGX_DIR);
               }
               break;
             case ".pyc":

brewkit/fixups/fix-pkg-config-file.ts

@@ -1,6 +1,6 @@
 import Path from "../path.ts";
 
-export async function fix_pkg_config_file(path: Path, install_prefix: Path) {
+export async function fix_pkg_config_file(path: Path, install_prefix: Path, PKGX_DIR: Path, og_PKGX_DIR: Path) {
   const orig = await path.read();
   const relative_path = install_prefix.relative({ to: path.parent() });
   const text = orig.replaceAll(
@@ -9,6 +9,9 @@ export async function fix_pkg_config_file(path: Path, install_prefix: Path) {
   ).replaceAll(
     "/usr/local",  // we also sometimes pretend to install to /usr/local so that the package requires less fuckery, eg. python
     `\${pcfiledir}/${relative_path}`,
+  ).replaceAll(
+    og_PKGX_DIR.string,  // for dependency paths that leak into these pcfiles
+    `\${prefix}/${PKGX_DIR.relative({ to: install_prefix })}`,
   );
   if (orig !== text) {
     console.log("%c+", "color:yellow", "fixing:", path);

projects/imagemagick.org/package.yml

@@ -55,4 +55,4 @@ linux:
 
 env:
   MAGICK_HOME: '{{prefix}}'
-  CPATH: "{{prefix}}/include/Magick-{{version.major}}:$CPATH"
+  CPATH: "{{prefix}}/include/ImageMagick-{{version.major}}:$CPATH"

projects/imagemagick.org/test.ts

@@ -37,11 +37,6 @@ export default async function ({ version }: TestOptions) {
 
   run`convert -delay 20 -loop 0 ${fixture('png')} ${fixture('png')} anim.gif`;
 
-  switch (version.major) {
-  case 6:
-    run`pkgx +ruby@3 gem install rmagick -v "~> 4.2"`;
-    break;
-  case 7:
-    run`pkgx +ruby@3 gem install rmagick -v "~> 5"`;
-  }
+  // the gem builds a native extension and it should *just work*
+  run`pkgx +ruby@3 gem install rmagick`;
 }