Changeset ae7bbbc in freewrt

Timestamp:

Jan 13, 2007, 11:47:02 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

9b55b84

Parents:

44991f8

Message:

fix the libtool problem, tested with mksh (no .la file),
libgpg-error (creates .la file), libgcrypt (uses libgpg-error)

git-svn-id: ​svn://www.freewrt.org/branches/common-adk@1589 afb5a338-a214-0410-bd46-81f09a774fd1

Files:

• mk/package.mk (modified) (1 diff)
• mk/pkg-bottom.mk (modified) (2 diffs)
• scripts/scan-tools.sh (modified) (1 diff)

mk/package.mk

@@ -86 +86 @@
             tee '$${STAGING_DIR}/pkg/$(1)' | \
             cpio -apdlmu '$${STAGING_DIR}'
+        @cd '${STAGING_DIR}'; grep 'usr/lib/.*\.la$$$$' 'pkg/$(1)' | \
+            while read fn; do \
+                chmod u+w $$$$fn; \
+                printf '%s\nwq\n' '/^libdir='\''*/s##&${STAGING_DIR}#' | \
+                    ed -s $$$$fn; \
+        done
         $${IPKG_BUILD} $${IDIR_$(1)} $${PACKAGE_DIR}
 

mk/pkg-bottom.mk

@@ -116 +116 @@
             find lib \( -name lib\*.so.\* -o -name lib\*.a \) \
                 -exec echo "WARNING: ${PKG_NAME} installs files in /lib - fix this!" >&2 \
-                \; -quit ; \
+                \; -quit 2>/dev/null; \
             find usr ! -type d 2>/dev/null | \
             grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' | \
             tee '${STAGING_DIR}/pkg/${PKG_NAME}' | \
             cpio -apdlmu '${STAGING_DIR}'
-        -rm -f ${STAGING_DIR}/{,usr/}lib/*.la
+        @cd '${STAGING_DIR}'; grep 'usr/lib/.*\.la$$' 'pkg/${PKG_NAME}' | \
+            while read fn; do \
+                chmod u+w $$fn; \
+                printf '%s\nwq\n' '/^libdir='\''*/s##&${STAGING_DIR}#' | \
+                    ed -s $$fn; \
+        done
         touch $@
 
@@ -133 +138 @@
 
 package: ${ALL_IPKGS}
-        cd $(WRKDIR)/fake-${ARCH}; y=; sp=; for x in ${ALL_IDIRS}; do \
+        @cd $(WRKDIR)/fake-${ARCH}; y=; sp=; for x in ${ALL_IDIRS}; do \
                 y="$$y$$sp$${x#$(WRKDIR)/fake-${ARCH}/}"; \
                 sp=' '; \

scripts/scan-tools.sh

@@ -272 +272 @@
 fi
 
+if ! which ed >/dev/null 2>&1; then
+        echo Why does your distribution not package the standard
+        echo text editor, ed? Please install it to continue.
+        out=1
+elif [[ "$(which ed 2>/dev/null)" != /bin/ed ]]; then
+        echo Your operating system installs ed, the standard text
+        echo editor, not as /bin/ed. While you can build FreeWRT
+        echo with this, ask your vendor to fix it, point to the
+        echo FHS if needed.
+fi
+
 
 cd $topdir