Package: picosat / 936-4

debian-changes-936-1 Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
Description: Upstream changes introduced in version 936-1
 This patch has been created by dpkg-source during the package build.
 Here's the last changelog entry, hopefully it gives details on why
 those changes were made:
 .
 picosat (936-1) unstable; urgency=low
 .
   * New upstream release (updated Debian-specific patches)
   * Bumped standards version to 3.9.1 (no changes)
 .
 The person named in the Author field signed this changelog entry.
Author: Michael Tautschnig <mt@debian.org>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- picosat-936.orig/makefile.in
+++ picosat-936/makefile.in
@@ -4,7 +4,7 @@ CFLAGS=@CFLAGS@
 all: @TARGETS@
 
 clean:
-	rm -f picosat *.exe *.s *.o *.a *.so
+	rm -f picosat *.exe *.s *.o *.a *.so.1.0.0
 	rm -f makefile config.h
 	rm -f gmon.out *~ 
 
@@ -36,8 +36,14 @@ libpicosat.a: picosat.o version.o
 	ar rc $@ picosat.o version.o
 	ranlib $@
 
-SONAME=-Xlinker -soname -Xlinker libpicosat.so
-libpicosat.so: picosat.o version.o
-	$(CC) $(CFLAGS) -shared -o $@ picosat.o version.o $(SONAME)
+%.pic.o: %.o
+	mv $< $*.nopic.o
+	$(MAKE) CFLAGS="$(CFLAGS) -fPIC" $<
+	mv $< $@
+	mv $*.nopic.o $<
+
+libpicosat.so: picosat.pic.o version.pic.o
+	$(CC) $(CFLAGS) -shared -Wl,-soname,libpicosat.so.1 -o \
+		libpicosat.so.1.0.0 $^ -lc
 
 .PHONY: all clean
--- picosat-936.orig/picosat.c
+++ picosat-936/picosat.c
@@ -6481,7 +6481,7 @@ check_trace_support_and_execute (FILE *
   (void) file;
   (void) fmt;
   (void) f;
-  ABORT ("compiled without trace support");
+  ABORT ("compiled without trace support; please use picosat.trace instead");
 #endif
 }
 
@@ -6900,7 +6900,7 @@ picosat_corelit (int int_lit)
       leave ();
   }
 #else
-  ABORT ("compiled without trace support");
+  ABORT ("compiled without trace support; please use picosat.trace instead");
 #endif
 
   return res;