Reapply "split out libvips into common"

This reverts commit c1674ca.
bjia56 · Jun 1, 2024 · 42f840e · 42f840e
1 parent c1674ca
commit 42f840e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/packages/pyvips/Dockerfile → packages/pyvips/Dockerfile.stage1 b/packages/pyvips/Dockerfile → packages/pyvips/Dockerfile.stage1
@@ -1,7 +1,5 @@
 FROM ghcr.io/bjia56/armv7l-wheel-builder:main
 ARG PYTHON_VERSION
-ARG VERSION
-ARG OUTPUT_DIR
 
 WORKDIR /
 RUN select_python ${PYTHON_VERSION}
@@ -16,13 +14,3 @@ RUN wget -q https://github.com/libvips/libvips/releases/download/v8.15.2/vips-8.
     meson compile && \
     meson install
 
-ENV CFLAGS='-I/tmp/vendor/include'
-ENV LDFLAGS='-L/tmp/vendor/lib'
-ENV LD_LIBRARY_PATH=/tmp/vendor/lib:$LD_LIBRARY_PATH
-ENV PKG_CONFIG_PATH=/tmp/vendor/lib/pkgconfig
-
-COPY . /repo
-RUN /repo/armv7l_build_wheels.sh ${PYTHON_VERSION} ${VERSION}
-
-RUN mkdir -p ${OUTPUT_DIR} && \
-    cp build${PYTHON_VERSION}/wheelhouse/pyvips*manylinux*armv7l.whl ${OUTPUT_DIR}
diff --git a/packages/pyvips/Dockerfile.stage2 b/packages/pyvips/Dockerfile.stage2
@@ -0,0 +1,15 @@
+FROM ghcr.io/bjia56/armv7l-wheel-builder:main
+ARG PYTHON_VERSION
+ARG VERSION
+ARG OUTPUT_DIR
+
+ENV CFLAGS='-I/tmp/vendor/include'
+ENV LDFLAGS='-L/tmp/vendor/lib'
+ENV LD_LIBRARY_PATH=/tmp/vendor/lib:$LD_LIBRARY_PATH
+ENV PKG_CONFIG_PATH=/tmp/vendor/lib/pkgconfig
+
+COPY . /repo
+RUN /repo/armv7l_build_wheels.sh ${PYTHON_VERSION} ${VERSION}
+
+RUN mkdir -p ${OUTPUT_DIR} && \
+    cp build${PYTHON_VERSION}/wheelhouse/pyvips*manylinux*armv7l.whl ${OUTPUT_DIR}
diff --git a/packages/pyvips/build.yaml b/packages/pyvips/build.yaml
@@ -1,6 +1,8 @@
 strategy: dockerfile
 source:
-- ./Dockerfile
+  - file: ./Dockerfile.stage1
+    common: true
+  - file: ./Dockerfile.stage2
 
 python:
   versions: