File loki_patch-fixes.diff of Package loki_setup

Overview Repositories Revisions Requests Users Attributes Meta

File loki_patch-fixes.diff of Package loki_setup

Index: loki_patch/Makefile.in
===================================================================
--- loki_patch.orig/Makefile.in
+++ loki_patch/Makefile.in
@@ -5,17 +5,14 @@ ARCH := @ARCH@
 DISTDIR = ..
 VERSION := @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_RELEASE@
 PACKAGE = loki_patch-$(VERSION)
+CC=@CC@
 
 XDELTA_DIR = ./xdelta-1.1.3
-SETUPDB = ../loki_setupdb
-CFLAGS = -g -Wall
-CFLAGS += -I$(SETUPDB)
-CFLAGS += $(shell glib-config --cflags) $(shell xml-config --cflags)
-CFLAGS += -DVERSION=\"$(VERSION)\"
-LFLAGS += -L$(SETUPDB)/$(ARCH) -lsetupdb
-LFLAGS += -L$(XDELTA_DIR)/.libs -lxdelta
-LFLAGS += -L$(XDELTA_DIR)/libedsio/.libs -ledsio
-LFLAGS += $(shell glib-config --libs) $(shell xml-config --libs) -lz -static
+SETUPDB = @SETUPDB@
+CFLAGS = @CFLAGS@
+CPPFLAGS += @XDELTA_CFLAGS@ @XML_CFLAGS@ @SETUPDB_CFLAGS@
+CPPFLAGS += -DVERSION=\"$(VERSION)\"
+LIBS = @LIBS@ @XDELTA_LIBS@ @XML_LIBS@ @SETUPDB_LIBS@ -L$(XDELTA_DIR)/.libs -lxdelta -L$(XDELTA_DIR)/libedsio/.libs -ledsio
 
 SHARED_OBJS = load_patch.o size_patch.o print_patch.o loki_xdelta.o \
 	      mkdirhier.o log_output.o
@@ -29,10 +26,10 @@ ALL_OBJS = $(SHARED_OBJS) $(MAKE_PATCH_O
 all: make_patch loki_patch
 
 make_patch: $(MAKE_PATCH_OBJS) $(SHARED_OBJS)
-	$(CC) -o $@ $^ $(LFLAGS)
+	$(CC) -o $@ $^ $(LIBS)
 
 loki_patch: $(LOKI_PATCH_OBJS) $(SHARED_OBJS)
-	$(CC) -o $@ $^ $(LFLAGS)
+	$(CC) -o $@ $^ $(LIBS)
 
 test: all cleanpat
 	gzip -cd test.tar.gz | tar xf -
Index: loki_patch/autogen.sh
===================================================================
--- loki_patch.orig/autogen.sh
+++ loki_patch/autogen.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
+aclocal
 autoconf
 
Index: loki_patch/configure.in
===================================================================
--- loki_patch.orig/configure.in
+++ loki_patch/configure.in
@@ -16,15 +16,12 @@ AC_PROG_INSTALL
 
 AC_CHECK_HEADERS(unistd.h)
 
-CFLAGS="-fsigned-char -funroll-loops -Wall -g -O2"
-
 case "$target" in
     *i?86*)
         ARCH=x86 ;;
     *x86_64*)
 	ARCH=amd64 ;;
     *alpha*)
-        CFLAGS="$CFLAGS -mcpu=ev4 -Wa,-mall"
         ARCH=alpha ;; 
     *)
         ARCH=`uname -m` ;;
@@ -33,15 +30,14 @@ OS=`uname -s`
 
 dnl Look for the XML libraries
 
-AC_PATH_PROG(HAVEXML, xml-config, $PATH)
+AC_PATH_PROG(HAVEXML, xml2-config, $PATH)
 if test ! -z "$HAVEXML"; then
     XML_CFLAGS=`$HAVEXML --cflags`
-    XML_PREFIX=`$HAVEXML --prefix`
-
-    CFLAGS="$CFLAGS $XML_CFLAGS"
-    LIBS="$LIBS $XML_PREFIX/lib/libxml.a"
+    XML_LIBS=`$HAVEXML --libs`
+    AC_SUBST(XML_CFLAGS)
+    AC_SUBST(XML_LIBS)
 else
-    AC_MSG_ERROR([*** xml-config not found. You need a working libxml installation.])
+    AC_MSG_ERROR([*** xml2-config not found. You need a working libxml installation.])
 fi
 
 SETUPDB_VERSION=1.0.0
@@ -60,14 +56,19 @@ fi
 dnl Check for correct setupdb installation
 
 if test -f $SETUPDB/$ARCH/libsetupdb.a; then
+    SETUPDB_LIBS="$LIBS $SETUPDB/$ARCH/libsetupdb.a"
+    SETUPDB_CFLAGS="-I$SETUPDB"
     AC_MSG_RESULT([SetupDB library found in $SETUPDB/$ARCH])
 else
     AC_MSG_ERROR([*** Please compile setupdb first!])
 fi
 
-CFLAGS="$CFLAGS -I$SETUPDB"
+AM_PATH_XDELTA
 
 AC_SUBST(SETUPDB)
+AC_SUBST(SETUPDB_CFLAGS)
+AC_SUBST(SETUPDB_LIBS)
+AC_SUBST(SETUPDB)
 AC_SUBST(ARCH)
 AC_SUBST(OS)
 AC_SUBST(VERSION_MAJOR)
Index: loki_patch/tree_patch.c
===================================================================
--- loki_patch.orig/tree_patch.c
+++ loki_patch/tree_patch.c
@@ -372,7 +372,7 @@ int tree_add_file(const char *path, cons
 int tree_add_path(const char *path, const char *dst, loki_patch *patch)
 {
     int is_toplevel;
-    struct op_add_path *op;
+    struct op_add_path *op = NULL;
     char child_path[PATH_MAX];
     char child_dst[PATH_MAX];
     struct stat sb;
@@ -934,7 +934,7 @@ int tree_tarfile(const char *tarfile, lo
     int is_compressed;
     char tmppath[PATH_MAX];
     char command[4*PATH_MAX];
-    int retval;
+    int retval = -1;
 
     /* Make sure we can read the tarfile */
     fp = fopen(tarfile, "rb");

Places

File loki_patch-fixes.diff of Package loki_setup

Places