- Workaround to build on fedora system (pkg-config problem)

kylewooten · Jul 24, 2007 · 5713af7 · 5713af7
1 parent 1e64d0a
commit 5713af7
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 4 deletions.
diff --git a/Changelog b/Changelog
@@ -36,6 +36,7 @@
  - BUGFIX: qBittorrent is not exiting anymore when a dialog is closed and main window is hidden
  - BUGFIX: Search plugin update is not making the GUI freeze anymore (moved to a thread)
  - BUGFIX: DHT settings were not saved correctly
+ - BUGFIX: Workaround to build on Fedora system (pkg-config problem)
  - COSMETIC: Redesigned torrent properties a little
  - COSMETIC: Redesigned options a little
  - COSMETIC: Display more logs messages concerning features

diff --git a/configure b/configure
@@ -348,7 +348,16 @@ public:
  if(!found) return false;
  conf->addLib(QString("-L") + s);
  }
- //conf->addLib("-ltorrent");
+ // BUGFIX for Fedora (doesn't support pkg-config?)
+ QFile issue_file("/etc/issue");
+ if(issue_file.open(QIODevice::ReadOnly | QIODevice::Text)){
+ QString content = issue_file.readAll();
+ issue_file.close();
+ if(content.indexOf("Fedora") != -1){
+ qWarning("Fedora detected. WORKAROUND for Fedora pkg-config problem enabled");
+ conf->addLib("-lssl -lcrypto -lboost_date_time -lboost_filesystem -lboost_thread -lz -ltorrent");
+ }
+ }
  return true;
  }
 };
@@ -470,7 +479,16 @@ public:
  if(!found) return false;
  conf->addLib(QString("-L") + s);
  }
- //conf->addLib("-lccext2 -lccgnu2");
+ // BUGFIX for Fedora (doesn't support pkg-config?)
+ QFile issue_file("/etc/issue");
+ if(issue_file.open(QIODevice::ReadOnly | QIODevice::Text)){
+ QString content = issue_file.readAll();
+ issue_file.close();
+ if(content.indexOf("Fedora") != -1){
+ qWarning("Fedora detected. WORKAROUND for Fedora pkg-config problem enabled");
+ conf->addLib("-pthread -lccext2 -lz -lccgnu2 -ldl -lrt");
+ }
+ }
  return true;
  }
 };

diff --git a/qcm/libcommoncpp2.qcm b/qcm/libcommoncpp2.qcm
@@ -58,7 +58,16 @@ public:
  if(!found) return false;
  conf->addLib(QString("-L") + s);
  }
- //conf->addLib("-lccext2 -lccgnu2");
+ // BUGFIX for Fedora (doesn't support pkg-config?)
+ QFile issue_file("/etc/issue");
+ if(issue_file.open(QIODevice::ReadOnly | QIODevice::Text)){
+ QString content = issue_file.readAll();
+ issue_file.close();
+ if(content.indexOf("Fedora") != -1){
+ qWarning("Fedora detected. WORKAROUND for Fedora pkg-config problem enabled");
+ conf->addLib("-pthread -lccext2 -lz -lccgnu2 -ldl -lrt");
+ }
+ }
  return true;
  }
 };
diff --git a/qcm/libtorrent.qcm b/qcm/libtorrent.qcm
@@ -63,7 +63,16 @@ public:
  if(!found) return false;
  conf->addLib(QString("-L") + s);
  }
- //conf->addLib("-ltorrent");
+ // BUGFIX for Fedora (doesn't support pkg-config?)
+ QFile issue_file("/etc/issue");
+ if(issue_file.open(QIODevice::ReadOnly | QIODevice::Text)){
+ QString content = issue_file.readAll();
+ issue_file.close();
+ if(content.indexOf("Fedora") != -1){
+ qWarning("Fedora detected. WORKAROUND for Fedora pkg-config problem enabled");
+ conf->addLib("-lssl -lcrypto -lboost_date_time -lboost_filesystem -lboost_thread -lz -ltorrent");
+ }
+ }
  return true;
  }
 };