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

Collapse All | Expand All

(-)a/Makefile (-14 / +5 lines)
Lines 23-42 export INCLUDEDIR Link Here
23
LIBDIR := $(mISDN_DIR)/lib
23
LIBDIR := $(mISDN_DIR)/lib
24
export LIBDIR
24
export LIBDIR
25
25
26
CFLAGS:= -g -Wall -I $(INCLUDEDIR)
26
CFLAGS += -g -Wall -I $(INCLUDEDIR)
27
27
CFLAGS += -DMISDN_OLD_AF_COMPATIBILITY -fPIC
28
CFLAGS += -DMISDN_OLD_AF_COMPATIBILITY
28
LDFLAGS += -g -L $(LIBDIR)
29
30
LDFLAGS:= -g -L $(LIBDIR)
31
32
#disable this if your system does not support PIC (position independent code)
33
ifeq ($(shell uname -m),x86_64)
34
CFLAGS         += -fPIC
35
endif
36
37
export CFLAGS
29
export CFLAGS
38
30
39
SUBDIRS := lib bridge tools example l1oip
31
SUBDIRS := lib tools
40
32
41
33
42
all:
34
all:
Lines 49-56 install_path: Link Here
49
	mkdir -p $(INSTALL_PREFIX)$(INSTALL_LIBDIR)
41
	mkdir -p $(INSTALL_PREFIX)$(INSTALL_LIBDIR)
50
42
51
43
52
install: install_path all
44
install: install_path
53
	$(MAKE) TARGET=install subdirs
54
	cp include/*.h $(INSTALL_PREFIX)/usr/include/mISDNuser/
45
	cp include/*.h $(INSTALL_PREFIX)/usr/include/mISDNuser/
55
46
56
47
(-)a/lib/Makefile (-6 / +3 lines)
Lines 15-24 MISDN_OBJ = debug.o mbuffer.o q931.o fsm.o mtimer.o mlayer3.o layer3.o dss1user. Link Here
15
15
16
MISDN_PICOBJ = $(ISDNNET_OBJ:%.o=%.lo)
16
MISDN_PICOBJ = $(ISDNNET_OBJ:%.o=%.lo)
17
17
18
ifeq ($(shell uname -m),x86_64)
19
CFLAGS         += -fPIC
20
endif
21
22
CFLAGS += $(EXTRA_CFLAGS) 
18
CFLAGS += $(EXTRA_CFLAGS) 
23
19
24
libmisdn_pic.a: $(MISDN_PICOBJ)
20
libmisdn_pic.a: $(MISDN_PICOBJ)
Lines 29-36 libmisdn.a: $(MISDN_OBJ) Link Here
29
	$(AR) cru $@ $^
25
	$(AR) cru $@ $^
30
	$(RANLIB) $@
26
	$(RANLIB) $@
31
27
32
libmisdn.so: $(MISDN_OBJ)
28
libmisdn.so: $(MISDN_PICOBJ)
33
	$(CC) $(CFLAGS) -shared -Xlinker -x -o $@ $^
29
	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libmISDN.so.0 -shared -o libmisdn.so.0 \
30
		$(MISDN_PICOBJ)
34
31
35
.c.o:
32
.c.o:
36
	$(CC) $(CFLAGS) -o $@ -c $<
33
	$(CC) $(CFLAGS) -o $@ -c $<
(-)a/suppserv/Makefile (-2 / +3 lines)
Lines 25-32 libsuppserv.a: $(SUPPSERV_OBJ) Link Here
25
	$(AR) cru $@ $<
25
	$(AR) cru $@ $<
26
	$(RANLIB) $@
26
	$(RANLIB) $@
27
27
28
libsuppserv.so: $(SUPPSERV_OBJ)
28
libsuppserv.so: $(SUPPSERV_PICOBJ)
29
	$(CC) -shared -Xlinker -x -o $@ $^
29
	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libsuppserv.so.0 -shared -o libsuppserv.so.0 \
30
		$(SUPPSERV_PICOBJ)
30
31
31
32
32
.c.o:
33
.c.o:

Return to bug 233873