diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-06 00:55:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-06 00:55:53 +0000 |
| commit | 3d0386f27ca66379acf50199e1d1298386eeeeb8 (patch) | |
| tree | f87bd4a126b3a843858eb447e8fd5893c3ee3882 /tests/deckard/contrib/libfaketime/packaging/Linux/Debian/avoid-spurious-lrt.patch | |
| parent | Initial commit. (diff) | |
| download | knot-resolver-3d0386f27ca66379acf50199e1d1298386eeeeb8.tar.xz knot-resolver-3d0386f27ca66379acf50199e1d1298386eeeeb8.zip | |
Adding upstream version 3.2.1.upstream/3.2.1upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests/deckard/contrib/libfaketime/packaging/Linux/Debian/avoid-spurious-lrt.patch')
| -rw-r--r-- | tests/deckard/contrib/libfaketime/packaging/Linux/Debian/avoid-spurious-lrt.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/tests/deckard/contrib/libfaketime/packaging/Linux/Debian/avoid-spurious-lrt.patch b/tests/deckard/contrib/libfaketime/packaging/Linux/Debian/avoid-spurious-lrt.patch new file mode 100644 index 0000000..c2f3f3f --- /dev/null +++ b/tests/deckard/contrib/libfaketime/packaging/Linux/Debian/avoid-spurious-lrt.patch @@ -0,0 +1,30 @@ +Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net> + +On i386 systems, for some reason if i do not clean up this extra -lrt, i get the following error: + + [...] +make[1]: Entering directory `/home/dkg/src/faketime/faketime/src' +cc -o libfaketime.o -c -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -std=gnu99 -Wall -Wextra -Werror -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'/usr/local'"' -DLIBDIRNAME='"'/lib/faketime'"' -DMULTI_ARCH libfaketime.c +cc -o libfaketime.so.1 -Wl,-soname,libfaketime.so.1 -Wl,-z,relro -Wl,--version-script=libfaketime.map -lrt -shared libfaketime.o -ldl -lm -lpthread -lrt +libfaketime.o: In function `ft_cleanup': +/home/dkg/src/faketime/faketime/src/libfaketime.c:1277: multiple definition of `timer_gettime' +/home/dkg/src/faketime/faketime/src/libfaketime.c:1277: multiple definition of `timer_settime' +collect2: error: ld returned 1 exit status +make[1]: *** [libfaketime.so.1] Error 1 + [...] + +I confess i don't really understand why removing this would fix +things, but i also don't see the need to have multiple attempts to +link to librt. + +--- a/src/Makefile ++++ b/src/Makefile +@@ -69,7 +69,7 @@ + + CFLAGS += -std=gnu99 -Wall -Wextra -Werror -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' + LIB_LDFLAGS += -shared +-LDFLAGS += -Wl,--version-script=libfaketime.map -lrt ++LDFLAGS += -Wl,--version-script=libfaketime.map + LDADD += -ldl -lm -lpthread -lrt + + SRC = libfaketime.c |