Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

build: consolidate PIC flags

should fix X86_32 build

git-svn-id: http://svn.mythtv.org/svn/trunk@25598 7dbf422c-18fa-0310-86e9-fd20926502f2
  • Loading branch information...
commit da7a7fe56c988894afdcb8b04087cd96278dcfec 1 parent 62d7b2c
@jannau jannau authored
View
2  mythtv/libs/libavcodec/libavcodec.pro
@@ -25,7 +25,7 @@ debug:contains(ARCH_X86_32, yes) {
}
# gcc-4.2 and newer can not compile with PIC on x86
contains(ARCH_X86_32, yes) {
- QMAKE_CFLAGS_SHLIB =
+ QMAKE_CFLAGS -= -fPIC -DPIC
}
!profile:QMAKE_CFLAGS_DEBUG += -O
View
2  mythtv/libs/libavutil/libavutil.pro
@@ -16,7 +16,7 @@ DEFINES += HAVE_AV_CONFIG_H
# Debug mode on x86 must compile without -fPIC
# otherwise gcc runs out of registers.
debug:contains(ARCH_X86_32, yes) {
- QMAKE_CFLAGS_SHLIB =
+ QMAKE_CFLAGS -= -fPIC -DPIC
}
QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
View
3  mythtv/libs/libmythbluray/libmythbluray.pro
@@ -10,9 +10,6 @@ INCLUDEPATH += . ../../
INCLUDEPATH += ./bdnav
INCLUDEPATH += ../libmythdb
-#build position independent code since the library is linked into a shared library
-QMAKE_CFLAGS += -fPIC -DPIC
-
DEFINES += HAVE_CONFIG_H DLOPEN_CRYPTO_LIBS
# DEFINES += LOG_DEBUG TRACE
View
3  mythtv/libs/libmythdvdnav/libmythdvdnav.pro
@@ -10,9 +10,6 @@ INCLUDEPATH += . ../../
INCLUDEPATH += ./dvdnav
INCLUDEPATH += ../libmythdb
-#build position independent code since the library is linked into a shared library
-QMAKE_CFLAGS += -fPIC -DPIC
-
# for -ldl
LIBS += $$EXTRA_LIBS
View
3  mythtv/libs/libmythfreesurround/libmythfreesurround.pro
@@ -6,9 +6,6 @@ CONFIG += thread staticlib warn_off
INCLUDEPATH += ../libavcodec ../libmythdb .. ../..
-#build position independent code since the library is linked into a shared library
-QMAKE_CXXFLAGS += -fPIC -DPIC
-
QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
# Input
View
2  mythtv/libs/libmythmpeg2/libmythmpeg2.pro
@@ -6,7 +6,7 @@ CONFIG += thread staticlib warn_off
CONFIG -= qt
#build position independent code since the library is linked into a shared library
-QMAKE_CFLAGS += -fPIC -DPIC -fno-common
+QMAKE_CFLAGS += -fno-common
QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
View
3  mythtv/libs/libmythnvctrl/libmythnvctrl.pro
@@ -7,9 +7,6 @@ CONFIG -= qt
INCLUDEPATH += ../ ../../
-#build position independent code since the library is linked into a shared library
-QMAKE_CFLAGS += -fPIC -DPIC
-
DEFINES += HAVE_AV_CONFIG_H
QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
View
3  mythtv/libs/libmythsamplerate/libmythsamplerate.pro
@@ -7,9 +7,6 @@ CONFIG -= qt
INCLUDEPATH += ../ ../../
-#build position independent code since the library is linked into a shared library
-QMAKE_CFLAGS += -fPIC -DPIC
-
DEFINES += HAVE_AV_CONFIG_H
QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
View
3  mythtv/libs/libmythsoundtouch/libmythsoundtouch.pro
@@ -7,9 +7,6 @@ CONFIG -= qt
INCLUDEPATH += ../../libs/libavcodec ../..
-#build position independent code since the library is linked into a shared library
-QMAKE_CXXFLAGS += -fPIC -DPIC
-
# Like libavcodec, debug mode on x86 runs out of registers on some GCCs.
!profile:QMAKE_CXXFLAGS_DEBUG += -O
View
3  mythtv/libs/libpostproc/libpostproc.pro
@@ -18,7 +18,8 @@ DEFINES += HAVE_AV_CONFIG_H
# Debug mode on x86 must compile without -fPIC
# otherwise gcc runs out of registers.
debug:contains(ARCH_X86_32, yes) {
- QMAKE_CFLAGS_SHLIB = -O1
+ QMAKE_CFLAGS -= -fPIC -DPIC
+ QMAKE_CFLAGS += -O1
}
QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
View
2  mythtv/libs/libswscale/libswscale.pro
@@ -14,7 +14,7 @@ debug:contains(ARCH_X86_32, yes) {
}
# gcc-4.2 and newer can not compile with PIC on x86
contains(ARCH_X86_32, yes) {
- QMAKE_CFLAGS_SHLIB =
+ QMAKE_CFLAGS -= -fPIC -DPIC
}
View
3  mythtv/settings.pro
@@ -92,9 +92,6 @@ profile:CONFIG += debug
QMAKE_CXXFLAGS += $$CONFIG_DIRECTFB_CXXFLAGS
-QMAKE_CFLAGS_SHLIB = -DPIC -fPIC
-QMAKE_CXXFLAGS_SHLIB = -DPIC -fPIC
-
# Allow compilation with Qt Embedded, if Qt is compiled without "-fno-rtti"
QMAKE_CXXFLAGS -= -fno-exceptions -fno-rtti
Please sign in to comment.
Something went wrong with that request. Please try again.