adding libjpeg

Author: gojko

Makefile

@@ -5,20 +5,32 @@ MOUNTS = -v $(PROJECT_ROOT)src:/var/task/src \
 	-v $(PROJECT_ROOT)build:/var/task/build \
 	-v $(PROJECT_ROOT)opt:/opt
 DOCKER = docker run -it --rm
+BASH = $(DOCKER) $(MOUNTS) --entrypoint /bin/bash -t $(DOCKER_IMAGE)
+IDENTIFY = $(DOCKER) $(MOUNTS) --entrypoint /opt/imagemagick/bin/identify -t $(DOCKER_IMAGE)
 
 vendor build opt: 
 	mkdir $@
 
 vendor/ImageMagick.tar.gz: vendor
 	cd vendor && curl -O https://imagemagick.org/download/ImageMagick.tar.gz
 
+vendor/jpegsrc.v9c.tar.gz:
+	cd vendor && curl -O http://ijg.org/files/jpegsrc.v9c.tar.gz
+
 clean:
 	rm -rf vendor build opt
 
-all: vendor/ImageMagick.tar.gz build opt
-	$(DOCKER) $(MOUNTS) --entrypoint /bin/bash -t $(DOCKER_IMAGE) /var/task/src/run.sh
+opt/imagemagick/lib/libjpeg.a: vendor/jpegsrc.v9c.tar.gz build opt
+	$(BASH) /var/task/src/make-libjpeg.sh
 
-identify: 
-	$(DOCKER) $(MOUNTS) --entrypoint /opt/imagemagick/bin/identify -t $(DOCKER_IMAGE) /var/task/src/test.jpg
+all: vendor/ImageMagick.tar.gz opt/imagemagick/lib/libjpeg.a build opt
+	$(BASH) /var/task/src/make-imagemagick.sh
 
+list-formats:
+	$(IDENTIFY) -list format
+
+identify: 
+	$(IDENTIFY) /var/task/src/test.jpg
 
+bash:
+	$(BASH)

src/run.sh renamed to src/make-imagemagick.sh

@@ -1,20 +1,21 @@
 #!/bin/bash
 
-echo "running from source"
+echo "building imagemagick"
 mkdir -p /opt/imagemagick
 cd /var/task/build
 tar xf /var/task/vendor/ImageMa*
 cd ImageMa*
 ./configure \
-  --without-shared \
+  CPPFLAGS="-I/opt/imagemagick/include" LDFLAGS='-L/opt/imagemagick/lib' \
+  --with-shared \
+  --without-static \
   --without-modules \
   --with-static \
   --prefix=/opt/imagemagick \
-  --without-perl \
-  --without-x \
   --disable-docs \
-  --without-magick-plus-plus
+  --disable-dependency-tracking \
+  --without-magick-plus-plus \
+  --without-perl \
+  --without-x
 make
 make install
-rm -rf opt/imagemagick/share/ImageMagick-7/man
-rm -rf opt/imagemagick/share/ImageMagick-7/doc

src/make-libjpeg.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+echo "building libjpeg"
+mkdir -p /opt/imagemagick
+cd /var/task/build
+tar xf /var/task/vendor/jpegsrc*
+cd jpeg*
+./configure \
+  --disable-dependency-tracking \
+  --prefix=/opt/imagemagick
+make
+make install