fix jpeg build for x86_64 hosts

[openwrt.git] / openwrt / package / avahi / Makefile

diff --git a/openwrt/package/avahi/Makefile b/openwrt/package/avahi/Makefile
index 7831475..16fb203 100644 (file)
--- a/openwrt/package/avahi/Makefile
+++ b/openwrt/package/avahi/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=avahi
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=avahi

-PKG_VERSION:=0.5
+PKG_VERSION:=0.6.1

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=8a1fcd3131364f8dce569282aab0d137
+PKG_MD5SUM:=330613902c59bd597f140a8254e9f4ec

 
 PKG_SOURCE_URL:=http://www.freedesktop.org/~lennart/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_SOURCE_URL:=http://www.freedesktop.org/~lennart/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz


@@ -24,8 +24,8 @@ $(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) -DNDEBUG" \
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) -DNDEBUG" \

-               CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-               LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
+               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \

                PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
                ac_cv_func_malloc_0_nonnull=yes \
                ac_cv_func_realloc_0_nonnull=yes \
                PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
                ac_cv_func_malloc_0_nonnull=yes \
                ac_cv_func_realloc_0_nonnull=yes \


@@ -64,7 +64,7 @@ $(PKG_BUILD_DIR)/.configured:
                        --disable-pygtk \
                        --disable-python-dbus \
                        --disable-mono \
                        --disable-pygtk \
                        --disable-python-dbus \
                        --disable-mono \

-                       --disable-mono-docs \
+                       --disable-monodoc \

                        --disable-doxygen-doc \
                        --disable-doxygen-dot \
                        --disable-doxygen-man \
                        --disable-doxygen-doc \
                        --disable-doxygen-dot \
                        --disable-doxygen-man \


@@ -99,36 +99,36 @@ $(IPKG_AVAHI_DAEMON):
        install -d -m0755 $(IDIR_AVAHI_DAEMON)/etc/init.d
        install -m0755 ./files/avahi-daemon.init $(IDIR_AVAHI_DAEMON)/etc/init.d/avahi-daemon
        install -d -m0755 $(IDIR_AVAHI_DAEMON)/usr/sbin
        install -d -m0755 $(IDIR_AVAHI_DAEMON)/etc/init.d
        install -m0755 ./files/avahi-daemon.init $(IDIR_AVAHI_DAEMON)/etc/init.d/avahi-daemon
        install -d -m0755 $(IDIR_AVAHI_DAEMON)/usr/sbin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/avahi-daemon $(IDIR_AVAHI_DAEMON)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/avahi-daemon $(IDIR_AVAHI_DAEMON)/usr/sbin/

        $(RSTRIP) $(IDIR_AVAHI_DAEMON)
        $(IPKG_BUILD) $(IDIR_AVAHI_DAEMON) $(PACKAGE_DIR)
 
 $(IPKG_AVAHI_DNSCONFD):
        install -d -m0755 $(IDIR_AVAHI_DNSCONFD)/etc/avahi
        $(RSTRIP) $(IDIR_AVAHI_DAEMON)
        $(IPKG_BUILD) $(IDIR_AVAHI_DAEMON) $(PACKAGE_DIR)
 
 $(IPKG_AVAHI_DNSCONFD):
        install -d -m0755 $(IDIR_AVAHI_DNSCONFD)/etc/avahi

-       cp -fpR $(PKG_INSTALL_DIR)/etc/avahi/avahi-dnsconfd.action $(IDIR_AVAHI_DNSCONFD)/etc/avahi/
+       $(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-dnsconfd.action $(IDIR_AVAHI_DNSCONFD)/etc/avahi/

        install -d -m0755 $(IDIR_AVAHI_DNSCONFD)/usr/sbin
        install -d -m0755 $(IDIR_AVAHI_DNSCONFD)/usr/sbin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(IDIR_AVAHI_DNSCONFD)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(IDIR_AVAHI_DNSCONFD)/usr/sbin/

        $(RSTRIP) $(IDIR_AVAHI_DNSCONFD)
        $(IPKG_BUILD) $(IDIR_AVAHI_DNSCONFD) $(PACKAGE_DIR)
 
 $(IPKG_LIBAVAHI):
        install -d -m0755 $(IDIR_LIBAVAHI)/usr/lib
        $(RSTRIP) $(IDIR_AVAHI_DNSCONFD)
        $(IPKG_BUILD) $(IDIR_AVAHI_DNSCONFD) $(PACKAGE_DIR)
 
 $(IPKG_LIBAVAHI):
        install -d -m0755 $(IDIR_LIBAVAHI)/usr/lib

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.so.* $(IDIR_LIBAVAHI)/usr/lib/
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.so.* $(IDIR_LIBAVAHI)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.so.* $(IDIR_LIBAVAHI)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.so.* $(IDIR_LIBAVAHI)/usr/lib/

        $(RSTRIP) $(IDIR_LIBAVAHI)
        $(IPKG_BUILD) $(IDIR_LIBAVAHI) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/avahi.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
        $(RSTRIP) $(IDIR_LIBAVAHI)
        $(IPKG_BUILD) $(IDIR_LIBAVAHI) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/avahi.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include

-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/avahi-common $(STAGING_DIR)/usr/include/
-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/avahi-core $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/avahi-common $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/avahi-core $(STAGING_DIR)/usr/include/

        mkdir -p $(STAGING_DIR)/usr/lib
        mkdir -p $(STAGING_DIR)/usr/lib

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.a $(STAGING_DIR)/usr/lib/
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.so* $(STAGING_DIR)/usr/lib/
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.a $(STAGING_DIR)/usr/lib/
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.so* $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.a $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.so* $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.a $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.so* $(STAGING_DIR)/usr/lib/

        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/avahi-core.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/avahi-core.pc $(STAGING_DIR)/usr/lib/pkgconfig/

        $(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/avahi-core.pc
        $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/avahi-core.pc
        touch $@
        $(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/avahi-core.pc
        $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/avahi-core.pc
        touch $@


@@ -145,8 +145,8 @@ uninstall-dev:
                $(STAGING_DIR)/usr/lib/libavahi-core.so* \
                $(STAGING_DIR)/usr/lib/pkgconfig/avahi-core.pc \
 
                $(STAGING_DIR)/usr/lib/libavahi-core.so* \
                $(STAGING_DIR)/usr/lib/pkgconfig/avahi-core.pc \
 

-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev

 
 mostlyclean:
        -$(MAKE) -C $(PKG_BUILD_DIR) clean
 
 mostlyclean:
        -$(MAKE) -C $(PKG_BUILD_DIR) clean