Attachment #212530 for bug #181685




PYVER := $(shell python -c "import sys; print sys.version[0:3]")
CFLAGS += -I/usr/include/python$(PYVER)
CFLAGS += -I$(TOPDIR)/nash/include -I$(TOPDIR)/bdevid/include
LDFLAGS += -shared -L$(TOPDIR)/nash -L$(TOPDIR)/bdevid
LDFLAGS += -Wl,-soname="pybdevid.so.$(VERSION)",--as-needed
LDFLAGS += -lpython$(PYVER) -ldl

pybdevid_OBJECTS = pybdevid.o
pybdevid_LIBS = -lpython$(PYVER) -ldl -lbdevid -lnash -ldevmapper -lparted -lblkid

pybdevid.so :: $(pybdevid_OBJECTS)
	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lbdevid $(pybdevid_LIBS)

Lines 31-40 Link Here

(-)mkinitrd-6.0.93.orig/Makefile.inc (-3 / +3 lines)
31	ARCH := $(patsubst sparc%,sparc,$(ARCH))	31	ARCH := $(patsubst sparc%,sparc,$(ARCH))
32	ARCH := $(patsubst ppc%,ppc,$(ARCH))	32	ARCH := $(patsubst ppc%,ppc,$(ARCH))
33		33
34	CC = gcc	34	CC ?= gcc
35	CFLAGS ?= -Wall -Werror -g -D_FORTIFY_SOURCE=2 -Wno-unused-function -fPIC \	35	CFLAGS += -Wall -D_FORTIFY_SOURCE=2 -Wno-unused-function -fPIC \
36	-std=gnu99 -D_GNU_SOURCE=1	36	-std=gnu99 -D_GNU_SOURCE=1
37	LDFLAGS ?= -Wl,--wrap,open,--wrap,fopen,--wrap,opendir,--wrap,socket \	37	LDFLAGS += -Wl,--wrap,open,--wrap,fopen,--wrap,opendir,--wrap,socket \
38	-Wl,--wrap,pipe,--wrap,mkdir,--wrap,access	38	-Wl,--wrap,pipe,--wrap,mkdir,--wrap,access
39		39
40	mandir = usr/share/man	40	mandir = usr/share/man

Return to bug 181685

Lines 28-39 Link Here

(-)mkinitrd-6.0.93.orig/bdevid/python/Makefile (-3 / +2 lines)
28	PYVER := $(shell python -c "import sys; print sys.version[0:3]")	28	PYVER := $(shell python -c "import sys; print sys.version[0:3]")
29	CFLAGS += -I/usr/include/python$(PYVER)	29	CFLAGS += -I/usr/include/python$(PYVER)
30	CFLAGS += -I$(TOPDIR)/nash/include -I$(TOPDIR)/bdevid/include	30	CFLAGS += -I$(TOPDIR)/nash/include -I$(TOPDIR)/bdevid/include
31	LDFLAGS = -shared -L$(TOPDIR)/nash -L$(TOPDIR)/bdevid	31	LDFLAGS += -shared -L$(TOPDIR)/nash -L$(TOPDIR)/bdevid
32	LDFLAGS += -Wl,-soname="pybdevid.so.$(VERSION)",--as-needed	32	LDFLAGS += -Wl,-soname="pybdevid.so.$(VERSION)",--as-needed
33	LDFLAGS += -lpython$(PYVER) -ldl
34		33
35	pybdevid_OBJECTS = pybdevid.o	34	pybdevid_OBJECTS = pybdevid.o
36	pybdevid_LIBS = -lbdevid -lnash -ldevmapper -lparted -lblkid	35	pybdevid_LIBS = -lpython$(PYVER) -ldl -lbdevid -lnash -ldevmapper -lparted -lblkid
37		36
38	pybdevid.so :: $(pybdevid_OBJECTS)	37	pybdevid.so :: $(pybdevid_OBJECTS)
39	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lbdevid $(pybdevid_LIBS)	38	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lbdevid $(pybdevid_LIBS)