From e4416a47e5935ae969e90186dfb3d0b228a056e5 Mon Sep 17 00:00:00 2001 From: Tobias Hintze Date: Thu, 12 Jul 2007 03:33:56 +0000 Subject: [PATCH] Tobias Hintze: fixed libowfat for cross-compiling git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8631 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/sirkull/libowfat/libowfat.desc | 2 +- .../libowfat/{prefix.patch => makefile.patch} | 24 ++++++++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) rename package/sirkull/libowfat/{prefix.patch => makefile.patch} (50%) diff --git a/package/sirkull/libowfat/libowfat.desc b/package/sirkull/libowfat/libowfat.desc index 2a4dd9d9b..3eb423ef4 100644 --- a/package/sirkull/libowfat/libowfat.desc +++ b/package/sirkull/libowfat/libowfat.desc @@ -37,7 +37,7 @@ [L] GPL [S] Stable [V] 0.25 -[P] X -?---5---9 153.400 +[P] X -X---5---9 153.400 [O] prefix=/opt/libowfat mandir=/opt/libowfat/man infodir=/opt/libowfat/info diff --git a/package/sirkull/libowfat/prefix.patch b/package/sirkull/libowfat/makefile.patch similarity index 50% rename from package/sirkull/libowfat/prefix.patch rename to package/sirkull/libowfat/makefile.patch index 83817ad1b..1aeedb683 100644 --- a/package/sirkull/libowfat/prefix.patch +++ b/package/sirkull/libowfat/makefile.patch @@ -1,6 +1,6 @@ diff -Naur libowfat-0.25-orig/GNUmakefile libowfat-0.25/GNUmakefile --- libowfat-0.25-orig/GNUmakefile 2006-07-16 01:17:01.000000000 +0200 -+++ libowfat-0.25/GNUmakefile 2007-07-01 00:24:24.289027108 +0200 ++++ libowfat-0.25/GNUmakefile 2007-07-12 03:16:41.764579693 +0200 @@ -4,7 +4,6 @@ # in /opt/diet, where they are in the default search path for my diet libc # work but don't conflict with anything there. YMMV. @@ -9,3 +9,25 @@ diff -Naur libowfat-0.25-orig/GNUmakefile libowfat-0.25/GNUmakefile LIBDIR=${prefix}/lib INCLUDEDIR=${prefix}/include MAN3DIR=${prefix}/man/man3 +@@ -132,8 +131,8 @@ + $(IO_OBJS) $(CDB_OBJS) + + libowfat.a: $(ALL_OBJS) +- $(CROSS)ar cr $@ $(ALL_OBJS) +- -$(CROSS)ranlib $@ ++ $(AR) cr $@ $(ALL_OBJS) ++ -$(RANLIB) $@ + + CFLAGS+=-I. + +@@ -141,8 +140,8 @@ + $(DIET) $(CC) -c $< $(CFLAGS) + + %.a: +- ar cr $@ $^ +- -ranlib $@ ++ $(AR) cr $@ $^ ++ -$(RANLIB) $@ + + t.o: iopause.h +