Search
SailfishOS Open Build Service
>
Projects
>
nemo
:
testing:hw
:
ti:omap3:n950-n9
>
fb_text2screen
> 0001-hack-fix-build-with-meego-mer-kernel.patch
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File 0001-hack-fix-build-with-meego-mer-kernel.patch of Package fb_text2screen
From 6aed52c3771ef5276900deb4c6138076ea053b2d Mon Sep 17 00:00:00 2001 From: Markus Lehtonen <markus.lehtonen@iki.fi> Date: Tue, 29 Nov 2011 20:15:22 +0200 Subject: [PATCH 1/2] hack: fix build with meego/mer kernel --- CMakeLists.txt | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a322841..8df9c18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 2.6) project(fb_text2screen C) set(fb_text2screen_VERSION 0.2-git) +set(CMAKE_INSTALL_PREFIX "/usr") + # Compiler flags set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_FORTIFY_SOURCE=2) set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} @@ -32,17 +34,21 @@ include(CheckIncludeFile) check_include_file("linux/omapfb.h" HAVE_LINUX_OMAPFB_H) if(NOT HAVE_LINUX_OMAPFB_H) - set(LINUX_SRC_DIR "/usr/src/linux" CACHE PATH "Path to Linux kernel sources") - if(NOT IS_DIRECTORY "${LINUX_SRC_DIR}") + if (EXISTS "/usr/include/linux/omapfb.h") + set(HAVE_LINUX_OMAPFB_H 1) + else() + set(LINUX_SRC_DIR "/usr/src/linux" CACHE PATH "Path to Linux kernel sources") + if(NOT IS_DIRECTORY "${LINUX_SRC_DIR}") message(FATAL_ERROR "No Linux sources found at ${LINUX_SRC_DIR}. Set LINUX_SRC_DIR variable to directory with Linux sources") - endif() + endif() - set(CMAKE_REQUIRED_INCLUDES "${LINUX_SRC_DIR}/include") - check_include_file("asm-arm/arch-omap/omapfb.h" HAVE_ARCH_OMAP_OMAPFB_H) - if(NOT HAVE_ARCH_OMAP_OMAPFB_H) - message(FATAL_ERROR "omapfb.h not found") + set(CMAKE_REQUIRED_INCLUDES "${LINUX_SRC_DIR}/include") + check_include_file("asm-arm/arch-omap/omapfb.h" HAVE_ARCH_OMAP_OMAPFB_H) + if(NOT HAVE_ARCH_OMAP_OMAPFB_H) + message(FATAL_ERROR "omapfb.h not found") + endif() + include_directories(AFTER SYSTEM ${CMAKE_REQUIRED_INCLUDES}) endif() - include_directories(AFTER SYSTEM ${CMAKE_REQUIRED_INCLUDES}) endif() # config.h -- 1.7.7