< prev index next >

make/lib/Awt2dLibraries.gmk

Print this page
rev 11830 : 8078245: AARCH64: JDK fails to build due to undefined symbol in libpng
Summary: Add -DPNG_ARM_NEON_OPT=0 to LIBSPLASHSCREEN_CFLAGS flags
Reviewed-by: dholmes, ihse, erikj


 810 
 811   ifeq ($(USE_EXTERNAL_LIBJPEG), true)
 812     LIBJPEG_LDFLAGS := -ljpeg
 813   else
 814     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg
 815     LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg
 816   endif
 817 
 818   ifeq ($(USE_EXTERNAL_LIBPNG), false)
 819     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/libsplashscreen/libpng
 820   else
 821     LIBSPLASHSCREEN_EXCLUDES += libpng
 822   endif
 823 
 824   ifneq ($(OPENJDK_TARGET_OS), macosx)
 825     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsplashscreen
 826   else
 827     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/macosx/native/libsplashscreen
 828   endif
 829 
 830   LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
 831       $(addprefix -I, $(LIBSPLASHSCREEN_DIRS)) \
 832       $(LIBJAVA_HEADER_FLAGS) \
 833       #
 834 
 835   ifeq ($(OPENJDK_TARGET_OS), macosx)
 836     LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
 837     LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp
 838 
 839     BUILD_LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
 840     BUILD_LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
 841     BUILD_LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0
 842     BUILD_LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0
 843     BUILD_LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0
 844     BUILD_LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
 845     BUILD_LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
 846 
 847   else ifeq ($(OPENJDK_TARGET_OS), windows)
 848     LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
 849   else
 850     LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)




 810 
 811   ifeq ($(USE_EXTERNAL_LIBJPEG), true)
 812     LIBJPEG_LDFLAGS := -ljpeg
 813   else
 814     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg
 815     LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg
 816   endif
 817 
 818   ifeq ($(USE_EXTERNAL_LIBPNG), false)
 819     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/libsplashscreen/libpng
 820   else
 821     LIBSPLASHSCREEN_EXCLUDES += libpng
 822   endif
 823 
 824   ifneq ($(OPENJDK_TARGET_OS), macosx)
 825     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsplashscreen
 826   else
 827     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/macosx/native/libsplashscreen
 828   endif
 829 
 830   LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 \
 831       $(addprefix -I, $(LIBSPLASHSCREEN_DIRS)) \
 832       $(LIBJAVA_HEADER_FLAGS) \
 833       #
 834 
 835   ifeq ($(OPENJDK_TARGET_OS), macosx)
 836     LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
 837     LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp
 838 
 839     BUILD_LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
 840     BUILD_LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
 841     BUILD_LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0
 842     BUILD_LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0
 843     BUILD_LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0
 844     BUILD_LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
 845     BUILD_LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
 846 
 847   else ifeq ($(OPENJDK_TARGET_OS), windows)
 848     LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
 849   else
 850     LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)


< prev index next >