- solve acl build.
authorRonan Le Martret <ronan@fridu.net>
Thu, 4 Apr 2013 13:09:06 +0000 (15:09 +0200)
committerRonan Le Martret <ronan@fridu.net>
Thu, 4 Apr 2013 13:09:06 +0000 (15:09 +0200)
Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/.macros.kate-swp [new file with mode: 0644]
Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/macros
Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/i586-linux/macros
Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/i686-linux/macros
Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/platform/noarch-linux/macros
Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/tizen/macros
Tizen_TZ_package/spec2yocto.py
meta-tizen-ivi/recipes-tizen/acl/acl-extraconf.inc
meta-tizen-ivi/recipes-tizen/acl/acl/package_utilies.m4 [new file with mode: 0644]
meta-tizen-ivi/recipes-tizen/acl/acl/relative-libdir.patch [new file with mode: 0644]

diff --git a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/.macros.kate-swp b/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/.macros.kate-swp
new file mode 100644 (file)
index 0000000..a038bc9
Binary files /dev/null and b/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/lib/.macros.kate-swp differ
index 48a7426..aab01e6 100644 (file)
@@ -855,7 +855,10 @@ print (t)\
 %_exec_prefix          %{_prefix}
 %_bindir               %{_exec_prefix}/bin
 %_sbindir              %{_exec_prefix}/sbin
-%_libexecdir           %{_exec_prefix}/libexec
+#RLM TEST for attr
+#%_libexecdir          %{_exec_prefix}/libexec
+%_libexecdir           \${base_prefix}/usr/lib
+
 %_datadir              %{_prefix}/share
 %_sysconfdir           \${base_prefix}/etc
 %_sharedstatedir       %{_prefix}/com
@@ -903,7 +906,22 @@ print (t)\
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
-  %{_configure} 
+  %{_configure} --build=%{_build} --host=%{_host} \\\
+       --target=%{_target_platform} \\\
+       --program-prefix=%{?_program_prefix} \\\
+       --prefix=%{_prefix} \\\
+       --exec-prefix=%{_exec_prefix} \\\
+       --bindir=%{_bindir} \\\
+       --sbindir=%{_sbindir} \\\
+       --sysconfdir=%{_sysconfdir} \\\
+       --datadir=%{_datadir} \\\
+       --includedir=%{_includedir} \\\
+       --libdir=%{_libdir} \\\
+       --libexecdir=%{_libexecdir} \\\
+       --localstatedir=%{_localstatedir} \\\
+       --sharedstatedir=%{_sharedstatedir} \\\
+       --mandir=%{_mandir} \\\
+       --infodir=%{_infodir}
 
 
 
index 43572c2..8f4ea3a 100644 (file)
 %__isa                 %{__isa_name}-%{__isa_bits}
 
 #==============================================================================
-# ---- configure macros.
-#
-
-%_exec_prefix          %{_prefix}
-%_bindir               %{_exec_prefix}/bin
-%_sbindir              %{_exec_prefix}/sbin
-%_libexecdir           %{_exec_prefix}/libexec
-%_datarootdir          %{_prefix}/share
-%_datadir              %{_datarootdir}
-
-%_libdir               %{_prefix}/lib
-%_includedir           %{_prefix}/include
-
-%_infodir              %{_datarootdir}/info
-%_mandir               %{_datarootdir}/man
-%_initddir             %{_sysconfdir}/rc.d/init.d
-# Deprecated misspelling, present for backwards compatibility.
-%_initrddir            %{_initddir}
-
-%_defaultdocdir                %{_datadir}/doc
-
-%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
-       && RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
-       [ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS")
-
-#==============================================================================
 # ---- Build policy macros.
 #
 #---------------------------------------------------------------------
index 4ff4ed1..8f4ea3a 100644 (file)
 %__isa                 %{__isa_name}-%{__isa_bits}
 
 #==============================================================================
-# ---- configure macros.
-#
-%_prefix               /usr
-%_exec_prefix          %{_prefix}
-%_bindir               %{_exec_prefix}/bin
-%_sbindir              %{_exec_prefix}/sbin
-%_libexecdir           %{_exec_prefix}/libexec
-%_datarootdir          %{_prefix}/share
-%_datadir              %{_datarootdir}
-
-%_libdir               %{_prefix}/lib
-%_includedir           %{_prefix}/include
-
-%_infodir              %{_datarootdir}/info
-%_mandir               %{_datarootdir}/man
-%_initddir             %{_sysconfdir}/rc.d/init.d
-# Deprecated misspelling, present for backwards compatibility.
-%_initrddir            %{_initddir}
-
-%_defaultdocdir                %{_datadir}/doc
-
-%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
-       && RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
-       [ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS")
-
-#==============================================================================
 # ---- Build policy macros.
 #
 #---------------------------------------------------------------------
index 371d913..5e4fe23 100644 (file)
@@ -9,33 +9,6 @@
 %_gnu                  -gnu
 %_target_platform      %{_target_cpu}-%{_vendor}-%{_target_os}
 
-
-#==============================================================================
-# ---- configure macros.
-#
-
-%_exec_prefix          %{_prefix}
-%_bindir               %{_exec_prefix}/bin
-%_sbindir              %{_exec_prefix}/sbin
-%_libexecdir           %{_exec_prefix}/libexec
-%_datarootdir          %{_prefix}/share
-%_datadir              %{_datarootdir}
-
-%_libdir               %{_prefix}/lib
-%_includedir           %{_prefix}/include
-
-%_infodir              %{_datarootdir}/info
-%_mandir               %{_datarootdir}/man
-%_initddir             %{_sysconfdir}/rc.d/init.d
-# Deprecated misspelling, present for backwards compatibility.
-%_initrddir            %{_initddir}
-
-%_defaultdocdir                %{_datadir}/doc
-
-%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
-       && RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
-       [ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS")
-
 #==============================================================================
 # ---- Build policy macros.
 #
index a2e9b0c..0695a05 100644 (file)
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
-  %{_configure} 
+  %{_configure} --build=%{_build} --host=%{_host} \\\
+       --target=%{_target_platform} \\\
+       --program-prefix=%{?_program_prefix} \\\
+       --prefix=%{_prefix} \\\
+       --exec-prefix=%{_exec_prefix} \\\
+       --bindir=%{_bindir} \\\
+       --sbindir=%{_sbindir} \\\
+       --sysconfdir=%{_sysconfdir} \\\
+       --datadir=%{_datadir} \\\
+       --includedir=%{_includedir} \\\
+       --libdir=%{_libdir} \\\
+       --libexecdir=%{_libexecdir} \\\
+       --localstatedir=%{_localstatedir} \\\
+       --sharedstatedir=%{_sharedstatedir} \\\
+       --mandir=%{_mandir} \\\
+       --infodir=%{_infodir}
 
 
 %reconfigure \
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
-  %{_configure}
+  %{_configure} --build=%{_build} --host=%{_host} \\\
+       --target=%{_target_platform} \\\
+       --program-prefix=%{?_program_prefix} \\\
+       --prefix=%{_prefix} \\\
+       --exec-prefix=%{_exec_prefix} \\\
+       --bindir=%{_bindir} \\\
+       --sbindir=%{_sbindir} \\\
+       --sysconfdir=%{_sysconfdir} \\\
+       --datadir=%{_datadir} \\\
+       --includedir=%{_includedir} \\\
+       --libdir=%{_libdir} \\\
+       --libexecdir=%{_libexecdir} \\\
+       --localstatedir=%{_localstatedir} \\\
+       --sharedstatedir=%{_sharedstatedir} \\\
+       --mandir=%{_mandir} \\\
+       --infodir=%{_infodir}
 
 #TO DO
 %autogen \
index 5adaace..701e0e2 100755 (executable)
@@ -263,14 +263,14 @@ class specParser:
         if pkgName in [ "glibc"]:
             command += " --define='_sbindir /usr/sbin'"
             
-        if pkgName in ["libelf0","freetype2","help2man","acl","libcap","popt","pcre","which","findutils"]:
+        if pkgName in ["libelf0","freetype2","help2man","libcap","popt","pcre","which","findutils"]:
             oe_runconf2='''oe_runconf2'''
             
             command += " --define='%%_configure %s'" % oe_runconf2
 
         #if pkgName in ["attr"]:
         #    oe_runconf2='''autotools_do_configure'''
-       #    command += " --define='%%_configure %s'" % oe_runconf2
+        #    command += " --define='%%_configure %s'" % oe_runconf2
 
         patternUrlSourceFile = r'Source[\d]*[\s]*:[\s]*([http,ftp].*/)(.*)'
         
@@ -291,18 +291,35 @@ class specParser:
                 tmp_package_spec_path=tmpSpecFile.name
                 
     
-        if pkgName == "attr":
-            for r in resUrlSourceFile:
-                currentSpecString=currentSpecString.replace('make configure','%configure')
-                currentSpecString=currentSpecString.replace('/lib/libattr.so\n','#/lib/libattr.so\n')
-                currentSpecString=currentSpecString.replace('\n/lib/libattr.so.*\n','\n%{_libdir}/libattr.so.*\n')
+        if pkgName in ["attr","acl"]:
+            currentSpecString=currentSpecString.replace('make configure','%configure')
+            #currentSpecString=currentSpecString.replace('/lib/libattr.so\n','#/lib/libattr.so\n')
+            #currentSpecString=currentSpecString.replace('\n/lib/libattr.so.*\n','\n%{_libdir}/libattr.so.*\n')
+                
+            with tempfile.NamedTemporaryFile(mode='w',
+                            suffix='tmp',
+                            prefix=os.path.basename(tmp_package_spec_path),
+                            delete=False) as  tmpSpecFile:
+                tmpSpecFile.write(currentSpecString)
+                tmp_package_spec_path=tmpSpecFile.name
                 
+           
+           
+        if pkgName in ["acl"]:
+            currentSpecString=currentSpecString.replace('ln -sf ../../%{_lib}/libacl.so %{buildroot}/%{_libdir}/libacl.so','ln -sf ../../%{_lib}/libacl.so %{buildroot}/%{_libexecdir}/libacl.so')
+            
             with tempfile.NamedTemporaryFile(mode='w',
                             suffix='tmp',
                             prefix=os.path.basename(tmp_package_spec_path),
                             delete=False) as  tmpSpecFile:
                 tmpSpecFile.write(currentSpecString)
                 tmp_package_spec_path=tmpSpecFile.name
+                
+                
+                
+        if pkgName in ["attr","acl"] :
+            command += " --define='_libdir \${base_prefix}/lib'"
+            command += " --define='_libexecdir \${base_prefix}/usr/lib'"
     
 
         if self.__packagePN == "dbus-initial":
@@ -370,7 +387,7 @@ class specParser:
                     
         command += " --parse %s " % tmp_package_spec_path
         if debug_run:
-           print "command :",command        
+            print "command :",command        
                 
         if not os.path.isdir(os.path.join("/tmp","parsed_spec")):
             os.mkdir(os.path.join("/tmp","parsed_spec"))
index e69de29..755ab20 100644 (file)
@@ -0,0 +1,21 @@
+inherit gettext
+
+# the package comes with a custom config.h.in, it cannot be
+# overwritten by autoheader
+export AUTOHEADER = "true"
+EXTRA_OECONF = "INSTALL_USER=root INSTALL_GROUP=root"
+
+EXTRA_OEMAKE = "PKG_LIB_DIR=${base_libdir} PKG_DEVLIB_DIR=${libdir}"
+
+
+SRC_URI += "file://relative-libdir.patch;striplevel=0 "
+
+SRC_URI += "file://package_utilies.m4"
+
+do_patch () {
+ echo RLM begining of do_patch
+ cat ${WORKDIR}/relative-libdir.patch | patch -p0 -b 
+ cp ${WORKDIR}/package_utilies.m4 m4/
+ echo RLM end of do_patch
+}
+
diff --git a/meta-tizen-ivi/recipes-tizen/acl/acl/package_utilies.m4 b/meta-tizen-ivi/recipes-tizen/acl/acl/package_utilies.m4
new file mode 100644 (file)
index 0000000..4de3d3b
--- /dev/null
@@ -0,0 +1,115 @@
+dnl Copyright (C) 2003, 2004, 2005, 2006, 2007  Silicon Graphics, Inc.
+dnl
+dnl This program is free software: you can redistribute it and/or modify it
+dnl under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation, either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Check for specified utility (env var) - if unset, fail.
+#
+AC_DEFUN([AC_PACKAGE_NEED_UTILITY],
+  [ if test -z "$2"; then
+        echo
+        echo FATAL ERROR: $3 does not seem to be installed.
+        echo $1 cannot be built without a working $4 installation.
+        exit 1
+    fi
+  ])
+
+#
+# Generic macro, sets up all of the global build variables.
+# The following environment variables may be set to override defaults:
+#  CC MAKE LIBTOOL TAR ZIP MAKEDEPEND AWK SED ECHO SORT
+#  MSGFMT MSGMERGE XGETTEXT RPM
+#
+AC_DEFUN([AC_PACKAGE_UTILITIES],
+  [ AC_PROG_CC
+    cc="$CC"
+    AC_SUBST(cc)
+    AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])
+
+    search_path="$PATH$PATH_SEPARATOR/usr/freeware/bin$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR/usr/local/bin"
+
+    AC_PATH_PROGS(MAKE, gmake make,, $search_path)
+    make=$MAKE
+    AC_SUBST(make)
+    AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make])
+
+    AC_PATH_PROG(TAR, tar,, $search_path)
+    tar=$TAR
+    AC_SUBST(tar)
+
+    AC_PATH_PROG(ZIP, gzip,, $search_path)
+    zip=$ZIP
+    AC_SUBST(zip)
+
+    AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true)
+    makedepend=$MAKEDEPEND
+    AC_SUBST(makedepend)
+
+    AC_PATH_PROG(AWK, awk,, $search_path)
+    awk=$AWK
+    AC_SUBST(awk)
+
+    AC_PATH_PROG(SED, sed,, $search_path)
+    sed=$SED
+    AC_SUBST(sed)
+
+    AC_PATH_PROG(ECHO, echo,, $search_path)
+    echo=$ECHO
+    AC_SUBST(echo)
+
+    AC_PATH_PROG(SORT, sort,, $search_path)
+    sort=$SORT
+    AC_SUBST(sort)
+
+    dnl check if symbolic links are supported
+    AC_PROG_LN_S
+
+    if test "$enable_gettext" = yes; then
+        AC_PATH_PROG(MSGFMT, msgfmt,, $search_path)
+        msgfmt=$MSGFMT
+        AC_SUBST(msgfmt)
+        AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext)
+
+        AC_PATH_PROG(MSGMERGE, msgmerge,, $search_path)
+        msgmerge=$MSGMERGE
+        AC_SUBST(msgmerge)
+        AC_PACKAGE_NEED_UTILITY($1, "$msgmerge", msgmerge, gettext)
+
+        AC_PATH_PROG(XGETTEXT, xgettext,, $search_path)
+        xgettext=$XGETTEXT
+        AC_SUBST(xgettext)
+        AC_PACKAGE_NEED_UTILITY($1, "$xgettext", xgettext, gettext)
+
+        AC_DEFINE([ENABLE_GETTEXT], 1, [enable gettext])
+    fi
+
+    AC_PATH_PROG(RPM, rpm,, $search_path)
+    rpm=$RPM
+    AC_SUBST(rpm)
+
+    dnl .. and what version is rpm
+    rpm_version=0
+    test -n "$RPM" && test -x "$RPM" && rpm_version=`$RPM --version \
+                        | awk '{print $NF}' | awk -F. '{V=1; print $V}'`
+    AC_SUBST(rpm_version)
+    dnl At some point in rpm 4.0, rpm can no longer build rpms, and
+    dnl rpmbuild is needed (rpmbuild may go way back; not sure)
+    dnl So, if rpm version >= 4.0, look for rpmbuild.  Otherwise build w/ rpm
+    if test $rpm_version -ge 4; then
+        AC_PATH_PROG(RPMBUILD, rpmbuild)
+        rpmbuild=$RPMBUILD
+    else
+        rpmbuild=$RPM
+    fi
+    AC_SUBST(rpmbuild)
+  ])
diff --git a/meta-tizen-ivi/recipes-tizen/acl/acl/relative-libdir.patch b/meta-tizen-ivi/recipes-tizen/acl/acl/relative-libdir.patch
new file mode 100644 (file)
index 0000000..b72bf18
--- /dev/null
@@ -0,0 +1,25 @@
+Upstream-Status: Pending
+
+use relative path in symbolic links, or it fails in staging
+sed expression from udev
+
+7/29/2010 - created by Qing He <qing.he@intel.com>
+
+diff -u include.orig/buildmacros include/buildmacros
+--- include.orig/buildmacros   2010-07-29 17:39:48.000000000 +0800
++++ include/buildmacros        2010-07-29 18:20:34.000000000 +0800
+@@ -88,9 +88,11 @@
+       ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+       ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
+       if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
+-      ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
+-      ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
+-      ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
++      rel_lib_prefix=$$(echo $(PKG_LIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
++      ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
++      ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
++      rel_devlib_prefix=$$(echo $(PKG_DEVLIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
++      ../$(INSTALL) -S $$rel_devlib_prefix$(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
+       fi
+ else
+ INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)