put jpeg+png in static lib, if we are doing dynamic, system will be used instead of static. But static are included twice (sdl_image + pygame.imageext). must fix it.

tito · tito · commit ea20613a73cd · 2012-01-08T00:43:06.000+01:00
diff --git a/recipes/python/patches/verbose-compilation.patch b/recipes/python/patches/verbose-compilation.patch
@@ -0,0 +1,13 @@
+--- Python-2.7.2/Makefile.pre.in.orig	2012-01-07 18:25:42.097075564 +0100
++++ Python-2.7.2/Makefile.pre.in	2012-01-07 18:26:03.289074810 +0100
+@@ -410,8 +410,8 @@
+ # Build the shared modules
+ sharedmods: $(BUILDPYTHON)
+ 	@case $$MAKEFLAGS in \
+-	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' PYTHONXCPREFIX='$(DESTDIR)$(prefix)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
+-	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' PYTHONXCPREFIX='$(DESTDIR)$(prefix)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
++	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' PYTHONXCPREFIX='$(DESTDIR)$(prefix)' $(HOSTPYTHON) -E $(srcdir)/setup.py build -v;; \
++	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' PYTHONXCPREFIX='$(DESTDIR)$(prefix)' $(HOSTPYTHON) -E $(srcdir)/setup.py build -v;; \
+ 	esac
+ 
+ # Build static library
diff --git a/src/jni/jpeg/Android.mk b/src/jni/jpeg/Android.mk
@@ -34,4 +34,4 @@ LOCAL_CFLAGS += -O3 -fstrict-aliasing -fprefetch-loop-arrays
 
 LOCAL_MODULE:= jpeg
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/src/jni/png/Android.mk b/src/jni/png/Android.mk
@@ -38,5 +38,5 @@ LOCAL_MODULE:= png
 LOCAL_COPY_HEADERS_TO := $(common_COPY_HEADERS_TO)
 LOCAL_COPY_HEADERS := $(common_COPY_HEADERS)
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
 

Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,4 @@ LOCAL_CFLAGS += -O3 -fstrict-aliasing -fprefetch-loop-arrays`
`34`	`34`
`35`	`35`	`LOCAL_MODULE:= jpeg`
`36`	`36`
`37`		`-include $(BUILD_SHARED_LIBRARY)`
	`37`	`+include $(BUILD_STATIC_LIBRARY)`