소스 검색

fix build for lemote, enable system png usage

Waldemar Brodkorb 14 년 전
부모
커밋
d8801c28fc
1개의 변경된 파일12개의 추가작업 그리고 5개의 파일을 삭제
  1. 12 5
      package/firefox/Makefile

+ 12 - 5
package/firefox/Makefile

@@ -9,11 +9,11 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		c9a071b31bb90d05edfb93117d0a7537
 PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
-PKG_DEPENDS:=		libpthread alsa-lib dbus-glib glib libgtk+ libnotify libidl
+PKG_DEPENDS:=		libpthread alsa-lib dbus-glib glib libgtk+ libnotify
 PKG_DEPENDS+=		nspr nss libjpeg atk pango cairo libxt libx11 libstdcxx
-PKG_DEPENDS+=		libxdamage libxfixes
-PKG_BUILDDEP+=		alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11 libXt
-PKG_BUILDDEP+=		nspr nss jpeg
+PKG_DEPENDS+=		libxdamage libxfixes libidl
+PKG_BUILDDEP+=		alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11
+PKG_BUILDDEP+=		nspr nss jpeg libXt
 PKG_URL:=		http://www.mozilla.org/
 PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
 
@@ -26,6 +26,12 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FIREFOX,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+ifeq (${ADK_LINUX_MIPS64_LEMOTE},y)
+CONFIGURE_ARGS+=	--disable-ipc
+else
+CONFIGURE_ARGS+=	--enable-ipc
+endif
+
 CONFIGURE_ENV+=		CROSS_COMPILE=1 HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" \
 			HOST_CXX="${HOSTCXX}" HOST_CXXFLAGS="${HOSTCXXFLAGS}" \
 			HOST_LIBIDL_CONFIG="/usr/bin/libIDL-config-2" \
@@ -33,11 +39,12 @@ CONFIGURE_ENV+=		CROSS_COMPILE=1 HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}"
 CONFIGURE_ARGS+=	--enable-application=browser \
 			--with-system-zlib \
 			--with-system-jpeg \
+			--with-system-png \
 			--with-system-nss \
 			--with-system-nspr \
+			--enable-libxul \
 			--disable-tests \
 			--disable-static \
-			--enable-libxul \
 			--disable-gnomeui \
 			--disable-gnomevfs \
 			--disable-optimize \