Merge pull request #1456 from ertugerata/master
python-pyblock fix build
This commit is contained in:
@@ -10,8 +10,6 @@
|
|||||||
desktop/kde/application/okular
|
desktop/kde/application/okular
|
||||||
desktop/kde/edu/kstars
|
desktop/kde/edu/kstars
|
||||||
desktop/kde/education/kmplot
|
desktop/kde/education/kmplot
|
||||||
desktop/kde/games/kshisen
|
|
||||||
desktop/kde/games/libkdegames
|
|
||||||
desktop/kde/plasma/libksysguard
|
desktop/kde/plasma/libksysguard
|
||||||
editor/emacs/emacs-php-mode
|
editor/emacs/emacs-php-mode
|
||||||
hardware/disk/reiserfsprogs
|
hardware/disk/reiserfsprogs
|
||||||
@@ -20,7 +18,6 @@
|
|||||||
hardware/misc/libsmbios
|
hardware/misc/libsmbios
|
||||||
hardware/powermanagement/suspend
|
hardware/powermanagement/suspend
|
||||||
hardware/scanner/sane-backends
|
hardware/scanner/sane-backends
|
||||||
hardware/virtualization/virtualbox
|
|
||||||
kernel/drivers/module-fglrx
|
kernel/drivers/module-fglrx
|
||||||
multimedia/converter/pythonmagick
|
multimedia/converter/pythonmagick
|
||||||
multimedia/editor/blender
|
multimedia/editor/blender
|
||||||
@@ -46,7 +43,6 @@
|
|||||||
programming/library/libaccounts-qt5
|
programming/library/libaccounts-qt5
|
||||||
programming/library/libsignon-glib
|
programming/library/libsignon-glib
|
||||||
programming/misc/vigra
|
programming/misc/vigra
|
||||||
programming/profiler/valgrind
|
|
||||||
system/boot/efibootmgr
|
system/boot/efibootmgr
|
||||||
system/boot/efivar
|
system/boot/efivar
|
||||||
util/crypt/skey
|
util/crypt/skey
|
||||||
|
|||||||
@@ -8,11 +8,11 @@ from pisi.actionsapi import autotools
|
|||||||
from pisi.actionsapi import shelltools
|
from pisi.actionsapi import shelltools
|
||||||
from pisi.actionsapi import get
|
from pisi.actionsapi import get
|
||||||
|
|
||||||
#WorkDir = "pyblock-0.47-1_20100712"
|
|
||||||
|
|
||||||
def build():
|
def build():
|
||||||
shelltools.export("CFLAGS", "%s -g -I/usr/include/%s -Wall -Werror -fPIC" % (get.CFLAGS(), get.curPYTHON()))
|
shelltools.export("CFLAGS", "%s -g -I/usr/include/%s -Wall -fPIC" % (get.CFLAGS(), get.curPYTHON()))
|
||||||
shelltools.export("LDFLAGS", "%s -shared" % get.LDFLAGS())
|
shelltools.export("LDFLAGS", "%s -shared" % get.LDFLAGS())
|
||||||
|
|
||||||
autotools.make("USESELINUX=0")
|
autotools.make("USESELINUX=0")
|
||||||
|
|
||||||
def install():
|
def install():
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
diff -Nuar pyblock-0.53.orig/Makefile pyblock-0.53/Makefile
|
||||||
|
--- pyblock-0.53.orig/Makefile 2016-03-30 09:41:42.510926755 +0300
|
||||||
|
+++ pyblock-0.53/Makefile 2016-03-30 09:42:32.328924813 +0300
|
||||||
|
@@ -5,19 +5,19 @@
|
||||||
|
DEBUGLIB := "/usr/lib/debug"
|
||||||
|
CC := gcc
|
||||||
|
PYVER := $(shell python -c "import sys; print sys.version[0:3]")
|
||||||
|
-CFLAGS := -g -I/usr/include/python$(PYVER) -Wall -Werror -fPIC $(OPTFLAGS) -fno-strict-aliasing
|
||||||
|
+CFLAGS := -g -I/usr/include/python$(PYVER) -Wall -fPIC $(OPTFLAGS) -fno-strict-aliasing
|
||||||
|
LDFLAGS := -shared
|
||||||
|
|
||||||
|
VERSION := $(shell awk '/Version:/ { print $$2 }' python-pyblock.spec)
|
||||||
|
RELEASE := $(shell awk -F '[ %]' '/Release:/ { print $$2 }' python-pyblock.spec)
|
||||||
|
USESELINUX = 1
|
||||||
|
|
||||||
|
-dm_LIBS = dmraid devmapper
|
||||||
|
+dm_LIBS = devmapper python2.7
|
||||||
|
ifeq (1, $(USESELINUX))
|
||||||
|
dm_LIBS += selinux
|
||||||
|
CFLAGS += -DUSESELINUX=1
|
||||||
|
endif
|
||||||
|
-dmraid_LIBS = dmraid devmapper
|
||||||
|
+dmraid_LIBS = dmraid python2.7
|
||||||
|
|
||||||
|
PYFILES=__init__.py maps.py device.py
|
||||||
|
LIBS = dmmodule.so dmraidmodule.so
|
||||||
Reference in New Issue
Block a user