Changeset 303f30e in freewrt

Timestamp:

May 22, 2007, 2:18:54 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

070e631

Parents:

76eb251

Message:

• mk/pkg-bottom.mk: change BUILD_STYLE and INSTALL_STYLE to allow for coexistence of several styles, like with CONFIGURE_STYLE
• glib/Makefile, mk/pkg-bottom.mk: make a new INSTALL_STYLE called “confprog” out of glib's fixup of the pkg-config data files and the $foo-config scripts
• libxml2: use confprog, bump dashver – fixes neon configure

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2598 afb5a338-a214-0410-bd46-81f09a774fd1

Files:

• mk/pkg-bottom.mk (modified) (3 diffs)
• package/glib/Makefile (modified) (2 diffs)
• package/libxml2/Makefile (modified) (2 diffs)

mk/pkg-bottom.mk

@@ -60 +60 @@
 ${_BUILD_COOKIE}: ${_CONFIGURE_COOKIE}
         @env ${MAKE_ENV} ${MAKE} pre-build
-ifeq (${BUILD_STYLE},auto)
+ifneq ($(filter auto,${BUILD_STYLE}),)
         cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
             ${MAKE_FLAGS} ${ALL_TARGET}
@@ -81 +81 @@
         @${MAKE} ${_ALL_CONTROLS}
         @env ${MAKE_ENV} ${MAKE} pre-install
-ifeq (${INSTALL_STYLE},auto)
+ifneq ($(filter auto,${INSTALL_STYLE}),)
         cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
             DESTDIR='${WRKINST}' ${FAKE_FLAGS} ${INSTALL_TARGET}
@@ -89 +89 @@
         @echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2
         @exit 1
+endif
+ifneq ($(filter confprog,${INSTALL_STYLE}),)
+        for a in ${WRKINST}/usr/{bin/*-config,lib/pkgconfig/*.pc}; do \
+                [[ -e $$a ]] || break; \
+                printf ',g/^prefix=/s,,&${STAGING_DIR},\nwq\n' | ed -s $$a; \
+        done
+        @: # not needed at the moment: ',g/-[IL].{/s,-[IL],&${STAGING_DIR},'
 endif
         @env ${MAKE_ENV} ${MAKE} post-install

package/glib/Makefile

@@ -44 +44 @@
                         glib_cv_byte_contents_gmutex="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"
 BUILD_STYLE=            auto
-INSTALL_STYLE=          auto
+INSTALL_STYLE=          auto confprog
 
 post-install:
@@ -53 +53 @@
         ${INSTALL_DIR} ${WRKINST}/usr/include/glib-1.2
         ${CP} ${WRKBUILD}/glibconfig-sysdefs.h ${WRKINST}/usr/include/glib-1.2/
-        for a in ${WRKINST}/usr/{bin/glib-config,lib/pkgconfig/*.pc}; do \
-                printf ',g/^prefix=/s,,&${STAGING_DIR},\nwq\n' | ed -s $$a; \
-        done
-#',g/-[IL].{/s,-[IL],&${STAGING_DIR},' | 
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libxml2/Makefile

@@ -9 +9 @@
 PKG_NAME:=              libxml2
 PKG_VERSION:=           2.6.20
-PKG_RELEASE:=           1
+PKG_RELEASE:=           2
 PKG_MD5SUM:=            8f0b3ce721bda11401e656b90ba4e78c
 PKG_SOURCE_URL:=        http://xmlsoft.org/sources/ \
@@ -48 +48 @@
 
 BUILD_STYLE=            auto
-INSTALL_STYLE=          auto
+INSTALL_STYLE=          auto confprog
 
 post-install:
         ${INSTALL_DIR} ${IDIR_LIBXML2}/usr/lib
         ${CP} ${WRKINST}/usr/lib/libxml2.so.* ${IDIR_LIBXML2}/usr/lib/
-        # fixup pkg-config stuff
-        ${SED} 's,-I$${includedir}/libxml2,,g' ${WRKINST}/usr/bin/xml2-config
-        ${SED} 's,-I$${includedir},,g' ${WRKINST}/usr/bin/xml2-config
-        ${SED} 's,-I${STAGING_DIR}/usr/include,,g' ${WRKINST}/usr/bin/xml2-config
-        ${SED} 's,-L$${libdir},,g' ${WRKINST}/usr/bin/xml2-config
-        ${SED} 's,-L${STAGING_DIR}/usr/lib,,g' ${WRKINST}/usr/bin/xml2-config
-        ${SED} 's,-I$${includedir}/libxml2,,g' ${WRKINST}/usr/lib/pkgconfig/libxml-2.0.pc
-        ${SED} 's,-L$${libdir},,g' ${WRKINST}/usr/lib/pkgconfig/libxml-2.0.pc
 
 include ${TOPDIR}/mk/pkg-bottom.mk