projects / packages / poldek.git / blame
| Commit | Line | Data |
|---|---|---|
| 9b77d5f3 JR |
1 | In file included from /usr/include/stdint.h:27:0, |
| 2 | from /usr/lib64/gcc/x86_64-pld-linux/6.3.0/include/stdint.h:9, | |
| 3 | from local_stdint.c:2, | |
| 4 | from wrap_poldekmod.c:3066: | |
| 5 | /usr/include/bits/types.h:143:34: error: conflicting types for ‘__fsid_t’ | |
| 6 | __STD_TYPE __FSID_T_TYPE __fsid_t; /* Type of file system IDs. */ | |
| 7 | ^~~~~~~~ | |
| 8 | In file included from /usr/include/stdio.h:36:0, | |
| 9 | from /usr/include/python2.7/Python.h:33, | |
| 10 | from wrap_poldekmod.c:149: | |
| 11 | /usr/include/bits/types.h:143:26: note: previous declaration of ‘__fsid_t’ was here | |
| 12 | __STD_TYPE __FSID_T_TYPE __fsid_t; /* Type of file system IDs. */ | |
| 13 | ^~~~~~~~ | |
| 14 | make: *** [Makefile:487: wrap_poldekmod.lo] Error 1 | |
| 15 | ||
| 16 | --- poldek-0.32.2/python/Makefile.am~ 2016-01-30 15:05:57.000000000 +0100 | |
| 17 | +++ poldek-0.32.2/python/Makefile.am 2017-04-16 14:28:51.269840377 +0200 | |
| 18 | @@ -3,8 +3,8 @@ | |
| 19 | py_prefix = $(shell python -c "import sys; print sys.prefix") | |
| 20 | py_incdir = $(py_prefix)/include/python$(py_ver) | |
| 21 | ||
| 22 | -EXTRA_DIST = poldekmod.i local_stdint.c pyldek.py run.sh | |
| 23 | -CLEANFILES = wrap_* poldekmod.py local_stdint.h | |
| 24 | +EXTRA_DIST = poldekmod.i pyldek.py run.sh | |
| 25 | +CLEANFILES = wrap_* poldekmod.py | |
| 26 | ||
| 27 | AM_CPPFLAGS = @TRURL_INCLUDE@ @TNDB_INCLUDE@ -I$(top_srcdir) -I$(py_incdir) -I. | |
| 28 | ||
| 29 | @@ -21,16 +21,12 @@ | |
| 30 | CFLAGS= | |
| 31 | CPPFLAGS += -DSWIG -DPOCLIDEK_ITSELF | |
| 32 | ||
| 33 | -poldekmod.i: local_stdint.h | |
| 34 | - | |
| 35 | -#install-exec-hook: | |
| 36 | -# $(mkinstalldirs) "$(DESTDIR)$(py_sitedir)" | |
| 37 | +install-exec-hook: | |
| 38 | + $(mkinstalldirs) "$(DESTDIR)$(py_sitedir)" | |
| 39 | + $(install_sh) .libs/_poldekmod.so "$(DESTDIR)$(py_sitedir)" | |
| 40 | ||
| 41 | poldekmod.py: wrap_poldekmod.c | |
| 42 | ||
| 43 | -local_stdint.h: local_stdint.c | |
| 44 | - $(CPP) $< > $@ | |
| 45 | - | |
| 46 | #wrap_poldekmod.c: poldekmod.i | |
| 47 | # $(SWIG) $(SWIG_PYTHON_OPT) $(INCLUDES) -I/usr/include -o $@ $< | |
| 48 | ||
| 49 | --- poldek-0.32.2/python/poldekmod.i~ 2016-01-30 15:05:57.000000000 +0100 | |
| 50 | +++ poldek-0.32.2/python/poldekmod.i 2017-04-16 14:27:50.169060494 +0200 | |
| 51 | @@ -1,7 +1,6 @@ | |
| 52 | %module poldekmod | |
| 53 | ||
| 54 | %{ | |
| 55 | -#include "local_stdint.h" | |
| 56 | #include "poldek.h" | |
| 57 | #include "trurl/narray.h" | |
| 58 | #include "trurl/nhash.h" | |
| 59 | @@ -32,7 +32,6 @@ | |
| 60 | %} | |
| 61 | ||
| 62 | %include exception.i | |
| 63 | -%include "local_stdint.h" | |
| 64 | %include "trurl/narray.h" | |
| 65 | %include "capreq.h" | |
| 66 | %include "pkg.h" |