Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 379849 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-10 / +16 lines)
Line  Link Here
0
-- a/Makefile
0
++ b/Makefile
Lines 24-29 Link Here
24
24
25
CLEANFILES := numactl.o libnuma.o numactl numademo numademo.o distance.o \
25
CLEANFILES := numactl.o libnuma.o numactl numademo numademo.o distance.o \
26
	      memhog libnuma.so libnuma.so.1 numamon numamon.o syscall.o bitops.o \
26
	      memhog libnuma.so libnuma.so.1 numamon numamon.o syscall.o bitops.o \
27
	      distance.o_PIC libnuma.o_PIC syscall.o_PIC \
27
	      memhog.o util.o stream_main.o stream_lib.o shm.o stream clearcache.o \
28
	      memhog.o util.o stream_main.o stream_lib.o shm.o stream clearcache.o \
28
	      test/pagesize test/tshared test/mynode.o test/tshared.o mt.o empty.o empty.c \
29
	      test/pagesize test/tshared test/mynode.o test/tshared.o mt.o empty.o empty.c \
29
	      test/mynode test/ftok test/prefered test/randmap \
30
	      test/mynode test/ftok test/prefered test/randmap \
Lines 40-49 Link Here
40
libdir := ${prefix}/$(shell ./getlibdir)
41
libdir := ${prefix}/$(shell ./getlibdir)
41
docdir := ${prefix}/share/doc
42
docdir := ${prefix}/share/doc
42
43
43
all: numactl migratepages migspeed libnuma.so numademo numamon memhog \
44
NUMA_LIBS = libnuma.so
45
ifeq ($(BUILD_STATIC),yes)
46
NUMA_LIBS+= libnuma.a
47
endif
48
49
all: numactl migratepages migspeed numademo numamon memhog \
44
     test/tshared stream test/mynode test/pagesize test/ftok test/prefered \
50
     test/tshared stream test/mynode test/pagesize test/ftok test/prefered \
45
     test/randmap test/nodemap test/distance test/tbitmap test/move_pages \
51
     test/randmap test/nodemap test/distance test/tbitmap test/move_pages \
46
     test/mbind_mig_pages test/migrate_pages test/realloc_test libnuma.a
52
     test/mbind_mig_pages test/migrate_pages test/realloc_test ${NUMA_LIBS}
53
54
%.o_PIC: %.c
55
	${CC} -fPIC ${CPPFLAGS} ${CFLAGS} -c $< -o $@
47
56
48
numactl: numactl.o util.o shm.o bitops.o libnuma.so
57
numactl: numactl.o util.o shm.o bitops.o libnuma.so
49
58
Lines 81-103 Link Here
81
90
82
libnuma.so.1: versions.ldscript
91
libnuma.so.1: versions.ldscript
83
92
84
libnuma.so.1: libnuma.o syscall.o distance.o
93
libnuma.so.1: libnuma.o_PIC syscall.o_PIC distance.o_PIC
85
	${CC} ${LDFLAGS} -shared -Wl,-soname=libnuma.so.1 -Wl,--version-script,versions.ldscript -Wl,-init,numa_init -Wl,-fini,numa_fini -o libnuma.so.1 $(filter-out versions.ldscript,$^)
94
	${CC} ${LDFLAGS} -shared -Wl,-soname=libnuma.so.1 -Wl,--version-script,versions.ldscript -Wl,-init,numa_init -Wl,-fini,numa_fini -o libnuma.so.1 $(filter-out versions.ldscript,$^)
86
95
87
libnuma.so: libnuma.so.1
96
libnuma.so: libnuma.so.1
88
	ln -sf libnuma.so.1 libnuma.so
97
	ln -sf libnuma.so.1 libnuma.so
89
98
90
libnuma.o : CFLAGS += -fPIC
91
92
AR ?= ar
99
AR ?= ar
93
RANLIB ?= ranlib
100
RANLIB ?= ranlib
94
libnuma.a: libnuma.o syscall.o distance.o
101
libnuma.a: libnuma.o syscall.o distance.o
95
	$(AR) rc $@ $^
102
	$(AR) rc $@ $^
96
	$(RANLIB) $@
103
	$(RANLIB) $@
97
104
98
distance.o : CFLAGS += -fPIC
99
100
syscall.o : CFLAGS += -fPIC
101
105
102
test/tshared: test/tshared.o libnuma.so
106
test/tshared: test/tshared.o libnuma.so
103
107
Lines 142-149 Link Here
142
	( cd ${prefix}/share/man/man3 ; for i in $$(./manlinks) ; do ln -sf numa.3 $$i.3 ; done )
146
	( cd ${prefix}/share/man/man3 ; for i in $$(./manlinks) ; do ln -sf numa.3 $$i.3 ; done )
143
	mkdir -p ${libdir}
147
	mkdir -p ${libdir}
144
	install -m 0755 libnuma.so.1 ${libdir}
148
	install -m 0755 libnuma.so.1 ${libdir}
145
	cd ${libdir} ; ln -sf libnuma.so.1 libnuma.so
149
	cd ${libdir} ; ln -sf libnuma.so.1 libnuma.so	
150
ifeq ($(BUILD_STATIC),yes)
146
	install -m 0644 libnuma.a ${libdir}
151
	install -m 0644 libnuma.a ${libdir}
152
endif
147
	mkdir -p ${prefix}/include
153
	mkdir -p ${prefix}/include
148
	install -m 0644 numa.h numaif.h numacompat1.h ${prefix}/include
154
	install -m 0644 numa.h numaif.h numacompat1.h ${prefix}/include
149
	install -m 0755 numastat ${prefix}/bin
155
	install -m 0755 numastat ${prefix}/bin

Return to bug 379849