Mesa (master): mklib: remove unused -contents_of_archives(), add comments
Brian Paul
brianp at kemper.freedesktop.org
Thu Feb 18 20:03:04 UTC 2010
Module: Mesa
Branch: master
Commit: cc66847c1095d01fe766e004ad1d5dbf8c77b380
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc66847c1095d01fe766e004ad1d5dbf8c77b380
Author: Brian Paul <brianp at vmware.com>
Date: Thu Feb 18 13:02:59 2010 -0700
mklib: remove unused -contents_of_archives(), add comments
---
bin/mklib | 25 ++++---------------------
1 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/bin/mklib b/bin/mklib
index 68d2205..fa0c82b 100755
--- a/bin/mklib
+++ b/bin/mklib
@@ -24,6 +24,7 @@
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
# propagate any errors
function errtrap {
es=$?
@@ -31,8 +32,11 @@ function errtrap {
}
trap errtrap ERR
+
# Given a list of files, look for .a archives and unpack them.
# Return the original list of files minus the .a files plus the unpacked files.
+# first param: name of a temp directory (to be deleted when finished)
+# remaining params: list of .o and .a files
expand_archives() {
DIR=$1
shift
@@ -66,27 +70,6 @@ expand_archives() {
}
-# Given a list of files, look for .a archives and return a list of all objects
-# in the .a archives.
-contents_of_archives() {
- FILES=$@
- NEWFILES=""
- for FILE in $FILES ; do
- case $FILE in
- *.a)
- # get list of members in this .a archive
- MEMBERS=`ar t $FILE`
- NEWFILES="$NEWFILES $MEMBERS"
- ;;
- *)
- # skip other file types
- ;;
- esac
- done
- echo $NEWFILES
-}
-
-
# Make static library with 'ar'
# params:
# options to ar
More information about the mesa-commit
mailing list